Nuitka-winsvc 2.3.3__cp311-cp311-win_amd64.whl → 2.3.11__cp311-cp311-win_amd64.whl

nuitka/utils/Execution.py

@@ -352,13 +352,14 @@ def executeToolChecked(
     # Allow to avoid repeated scans in PATH for the tool.
     command[0] = getExecutablePath(tool)
 
-    process = subprocess.Popen(
-        command,
-        stdin=getNullInput(),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        shell=False,
-    )
+    with withEnvironmentVarOverridden("LC_ALL", "C"):
+        process = subprocess.Popen(
+            command,
+            stdin=getNullInput(),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            shell=False,
+        )
 
     stdout, stderr = process.communicate()
     result = process.poll()

nuitka/utils/FileOperations.py

@@ -290,7 +290,7 @@ def _restoreWindowsPath(orig_path, path):
             drive_real_path = os.path.realpath(drive + "\\")
             assert path.startswith(drive_real_path)
 
-            path = drive + path[len(drive_real_path) :]
+            path = drive + "\\" + path[len(drive_real_path) :]
     else:
         path = path.strip(os.path.sep)
 
@@ -1469,6 +1469,43 @@ def openPickleFile(filename, mode, protocol=-1):
         )
 
 
+def isLegalPath(path):
+    illegal_suffixes = "/\\"
+    illegal_chars = "\0"
+
+    if isWin32Windows():
+        illegal_chars += r'*"/<>:|?'
+
+        illegal_chars += "".join(chr(x) for x in range(1, 32))
+        illegal_suffixes += " ."
+
+    if isMacOS():
+        illegal_chars += ":"
+
+    for c in path:
+        if c in illegal_chars:
+            return False, "contains illegal character %r" % c
+
+    for illegal_suffix in illegal_suffixes:
+        if path.endswith(illegal_suffix):
+            return False, "contains illegal suffix %r" % illegal_suffix
+
+    return True, None
+
+
+def getParentDirectories(path):
+    """Get all parent directories of a path in descending order."""
+
+    while 1:
+        old_path = path
+        path = os.path.dirname(path)
+
+        if not path or path == old_path:
+            return
+
+        yield path
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

nuitka/utils/SharedLibraries.py

@@ -17,11 +17,7 @@ from nuitka.Options import getMacOSTargetArch, isShowInclusion, isUnstripped
 from nuitka.PythonVersions import python_version
 from nuitka.Tracing import inclusion_logger, postprocessing_logger
 
-from .Execution import (
-    executeToolChecked,
-    withEnvironmentPathAdded,
-    withEnvironmentVarOverridden,
-)
+from .Execution import executeToolChecked, withEnvironmentPathAdded
 from .FileOperations import (
     addFileExecutablePermission,
     changeFilenameExtension,
@@ -87,13 +83,12 @@ def locateDLL(dll_name):
             name=dll_name, paths=["/lib", "/usr/lib", "/usr/local/lib"]
         )
 
-    with withEnvironmentVarOverridden("LANG", "C"):
-        # TODO: Could and probably should cache "ldconfig -p" output to avoid forks
-        output = executeToolChecked(
-            logger=postprocessing_logger,
-            command=("/sbin/ldconfig", "-p"),
-            absence_message=_ldconfig_usage,
-        )
+    # TODO: Could and probably should cache "ldconfig -p" output to avoid forks
+    output = executeToolChecked(
+        logger=postprocessing_logger,
+        command=("/sbin/ldconfig", "-p"),
+        absence_message=_ldconfig_usage,
+    )
 
     dll_map = {}
 
@@ -349,14 +344,25 @@ def getSharedLibraryRPATH(filename):
 
 
 def _filterPatchelfErrorOutput(stderr):
+    non_errors = []
+
+    def isNonErrorExit(line):
+        if b"cannot find section '.dynamic'" in line:
+            non_errors.append(line)
+
+            return True
+
+        return False
+
     stderr = b"\n".join(
         line
         for line in stderr.splitlines()
         if line
         if b"warning: working around" not in line
+        if not isNonErrorExit(line)
     )
 
-    return None, stderr
+    return (0 if non_errors else None), stderr
 
 
 _patchelf_usage = """\
@@ -383,13 +389,12 @@ installed. Use 'apt/dnf/yum install patchelf' first.""",
 
 def _setSharedLibraryRPATHElf(filename, rpath):
     # patchelf --set-rpath "$ORIGIN/path/to/library" <executable>
-    with withEnvironmentVarOverridden("LANG", "C"):
-        executeToolChecked(
-            logger=postprocessing_logger,
-            command=("patchelf", "--set-rpath", rpath, filename),
-            stderr_filter=_filterPatchelfErrorOutput,
-            absence_message=_patchelf_usage,
-        )
+    executeToolChecked(
+        logger=postprocessing_logger,
+        command=("patchelf", "--set-rpath", rpath, filename),
+        stderr_filter=_filterPatchelfErrorOutput,
+        absence_message=_patchelf_usage,
+    )
 
 
 def _filterInstallNameToolErrorOutput(stderr):
@@ -600,7 +605,7 @@ def _getFileCommandOutput(filename):
 
 
 def hasUniversalOrMatchingMacOSArchitecture(filename):
-    assert isMacOS()
+    assert isMacOS() and os.path.isfile(filename), filename
 
     file_output = _getFileCommandOutput(filename)
 
@@ -788,20 +793,19 @@ def cleanupHeaderForAndroid(filename):
     created by default.
     """
 
-    with withEnvironmentVarOverridden("LANG", "C"):
-        executeToolChecked(
-            logger=postprocessing_logger,
-            command=("patchelf", "--shrink-rpath", filename),
-            stderr_filter=_filterPatchelfErrorOutput,
-            absence_message=_patchelf_usage,
-        )
+    executeToolChecked(
+        logger=postprocessing_logger,
+        command=("patchelf", "--shrink-rpath", filename),
+        stderr_filter=_filterPatchelfErrorOutput,
+        absence_message=_patchelf_usage,
+    )
 
-        executeToolChecked(
-            logger=postprocessing_logger,
-            command=("termux-elf-cleaner", "--quiet", filename),
-            absence_message=_termux_elf_cleaner_usage,
-            optional=True,
-        )
+    executeToolChecked(
+        logger=postprocessing_logger,
+        command=("termux-elf-cleaner", "--quiet", filename),
+        absence_message=_termux_elf_cleaner_usage,
+        optional=True,
+    )
 
 
 _nm_usage = """\