[packages/python-virtualenv] - adjusted multilib patch to use lib<qual> symlink even when using --always-copy; release 2
qboosh
qboosh at pld-linux.org
Tue Jul 24 18:01:47 CEST 2018
commit 8d99bf94201a8fc87ec0d4325c099e1bb6d213f5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jul 24 18:03:45 2018 +0200
- adjusted multilib patch to use lib<qual> symlink even when using --always-copy; release 2
multilib.patch | 14 +++++++++++++-
python-virtualenv.spec | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 93a93f1..c3c0a37 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -10,7 +10,7 @@ Summary: Tool to create isolated Python environments
Summary(pl.UTF-8): Narzędzie do tworzenia oddzielonych środowisk Pythona
Name: python-virtualenv
Version: 16.0.0
-Release: 1
+Release: 2
License: MIT
Group: Development/Languages
#Source0Download: https://pypi.org/simple/virtualenv/
diff --git a/multilib.patch b/multilib.patch
index 8955bd6..84dd1ba 100644
--- a/multilib.patch
+++ b/multilib.patch
@@ -55,8 +55,9 @@
- if os.path.lexists(lib64_link):
+ if os.path.lexists(libarch_link):
return
- if symlink:
+- if symlink:
- os.symlink('lib', lib64_link)
++ if True:
+ os.symlink('lib', libarch_link)
else:
- copyfile('lib', lib64_link)
@@ -93,3 +94,14 @@
# This is hardcoded in the Python executable, but relative to
# sys.prefix. Debian change: we need to add the multiarch triplet
# here, which is where the real stuff lives. As per PEP 421, in
+--- virtualenv-16.0.0/tests/test_virtualenv.py.orig 2018-05-17 01:36:07.000000000 +0200
++++ virtualenv-16.0.0/tests/test_virtualenv.py 2018-07-23 21:40:47.981924463 +0200
+@@ -135,6 +135,8 @@
+ for root, dirs, files in os.walk(tmp_virtualenv):
+ for f in files + dirs:
+ full_name = os.path.join(root, f)
++ if os.path.islink(full_name) and os.readlink(full_name) == "lib":
++ continue
+ assert not os.path.islink(full_name), "%s should not be a" \
+ " symlink (to %s)" % (full_name, os.readlink(full_name))
+ finally:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-virtualenv.git/commitdiff/8d99bf94201a8fc87ec0d4325c099e1bb6d213f5
More information about the pld-cvs-commit
mailing list