Remove force copy, self.symlinks is already False with Windows

Signed-off-by: Dan Yeaw <dan@yeaw.me>
msys2 · Jul 21, 2019 · 30632dd · 30632dd
1 parent dc2427d
commit 30632dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/mingw-w64-python3/2050-undo-venv-redirector.patch b/mingw-w64-python3/2050-undo-venv-redirector.patch
@@ -1,5 +1,5 @@
---- Python-3.7.4/Lib/venv/__init__.py	2019-07-15 20:24:18.070099400 -0400
-+++ Python-3.7.4/Lib/venv/__init__-patched.py	2019-07-20 17:35:07.180035100 -0400
+--- Python-3.7.4/Lib/venv/__init__.py	2019-07-20 20:56:20.832694700 -0400
++++ Python-3.7.4/Lib/venv/__init__-patched.py	2019-07-21 11:13:44.980704100 -0400
 @@ -11,6 +11,7 @@
  import sys
  import sysconfig
@@ -17,7 +17,7 @@
              binname = 'Scripts'
              incpath = 'Include'
              libpath = os.path.join(env_dir, 'Lib', 'site-packages')
-@@ -155,12 +156,12 @@
+@@ -155,7 +156,7 @@
              f.write('include-system-site-packages = %s\n' % incl)
              f.write('version = %d.%d.%d\n' % sys.version_info[:3])
 
@@ -26,12 +26,6 @@
          def symlink_or_copy(self, src, dst, relative_symlinks_ok=False):
              """
              Try symlinking a file, and if that fails, fall back to copying.
-             """
--            force_copy = not self.symlinks
-+            force_copy = True
-             if not force_copy:
-                 try:
-                     if not os.path.islink(dst): # can't link to itself!
 @@ -229,7 +230,7 @@
          path = context.env_exe
          copier = self.symlink_or_copy

diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD
@@ -549,7 +549,7 @@ sha256sums=('fb799134b868199930b75f26678f18932214042639cd52b16da7fd134cd9b13f'
             '2d6605515648ef3ffe53e417719d4d51a7a2a79566e26e920733422dfd3751cb'
             '6c4b0c469f3c04e5586553b7e4e8e30e8e36163f30d4139605b7c0eddf994347'
             '0f6c62a8b11198216e42b88f294e01150d255a6da72fb75c6677f64cc7a4a092'
-            'cd350b6f2eb2d26847c331b82946a52571f17a30d5a3a44e4b675098870bba9e'
+            '1497d664aa746cd6b0995d5518c7e0de2f80a08d125b472c81aabc99a484d445'
             '6ee9095eb78c88c205e225c0e8a0b169f5498c62d6531a2d3199450d0fe895e5'
             '19d1b5b8e078941dc4ede413e02212e3b7a79f8e445693f7f6d3e423220ccf4e'
             '821402ddaef92140c70041b007bcf15e1cd5fe0fdb9f4f612da868382cc24585')