Fix issues with wsl+docker on windows when building

Author: overfl0

tools/build.py

@@ -27,9 +27,21 @@ def parse_version_wrapper(txt):
     return version
 
 
+def _run(cmd, **kwargs):
+    # For some reason, when combined with wsl calls, Python thinks the directory we're in has been deleted
+    # so os.getcwd() fails
+    saved_directory = os.getcwd()
+    subprocess.run(cmd, **kwargs)
+    os.chdir(saved_directory)
+
+
 def _verbose_run(cmd, **kwargs):
     print(' '.join(c if ' ' not in c else f'"{c}"' for c in cmd), flush=True)
+    # For some reason, when combined with wsl calls, Python thinks the directory we're in has been deleted
+    # so os.getcwd() fails
+    saved_directory = os.getcwd()
     subprocess.run(cmd, **kwargs)
+    os.chdir(saved_directory)
 
 
 def clear_pythia_directory():
@@ -56,7 +68,7 @@ def del_rw(action, name, exc):
 def create_interpreters(version, dest):
     version = parse_version_wrapper(version)
     print(f'Creating Python {version} interpreters in "{dest}" directory...', flush=True)
-    subprocess.run([sys.executable, os.path.join('tools', 'create_embedded_python.py'), '--version', str(version), dest], check=True)
+    _run([sys.executable, os.path.join('tools', 'create_embedded_python.py'), '--version', str(version), dest], check=True)
 
 
 def _get_embed(version, system, arch):
@@ -113,7 +125,7 @@ def run_tests(version, arch, system):
 
 def build_pbos():
     print('Building PBOs...', flush=True)
-    subprocess.run([sys.executable, os.path.join('tools', 'create_pbos.py')], check=True)
+    _run([sys.executable, os.path.join('tools', 'create_pbos.py')], check=True)
 
 
 def copy_templates(version):
@@ -136,7 +148,7 @@ def copy_templates(version):
 def safety_checks(version):
     version = parse_version_wrapper(version)
     print('Running safety checks...', flush=True)
-    subprocess.run([sys.executable, os.path.join('tools', 'safety_checks.py'), str(version)], check=True)
+    _run([sys.executable, os.path.join('tools', 'safety_checks.py'), str(version)], check=True)
 
 
 def pack_mod():

tools/create_embedded_python.py

@@ -48,11 +48,14 @@ def convert_standalone_build(directory):
         dereference_symlinks('.')
         # Note: both adding the rpath and copying libcrypt will be unnecessary with 3.11+
         subprocess.run("patchelf --set-rpath '$ORIGIN/../lib' bin/python3", shell=True, check=True)
+        current_dir = os.getcwd()
         subprocess.run('docker run --platform linux/386 --rm -v "$(pwd)"/:/data quay.io/pypa/manylinux2014_i686:latest /bin/bash -c "cp /usr/local/lib/libcrypt.so.1 /data/ && chown 1000:1000 /data/libcrypt.so.1 && chmod 555 /data/libcrypt.so.1"',
                        shell=True, cwd='lib', check=True)
+        os.chdir(current_dir)
 
     os.chdir(currdir)
 
+
 def install_pip(python_executable):
     """Just call ensurepip and then the regular pip installation."""