1
0

Accepting request 624311 from home:mwilck:branches:devel:languages:python

- Fix failure of virtualenv --always-copy (bsc#1102096)

OBS-URL: https://build.opensuse.org/request/show/624311
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenv?expand=0&rev=59
This commit is contained in:
Tomáš Chvátal 2018-07-20 18:20:22 +00:00 committed by Git OBS Bridge
parent 9f9d5f8bdd
commit f19b851a67
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 786675a83f494202cb9522d57a98e5ddc0d7405e Mon Sep 17 00:00:00 2001
From: Ashley Whetter <asw@dneg.com>
Date: Tue, 3 Jul 2018 10:48:19 -0700
Subject: [PATCH] Fixed failure to copy on platforms that use lib64
The current behaviour attempts to copy a "lib" folder from the current directory,
instead of copying the "lib" folder inside the virtualenv. Therefore the copying would fail.
This fixes that by always copying the "lib" folder from the virtualenv.
---
virtualenv.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtualenv.py b/virtualenv.py
index c008a395..34c2f6a1 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -1559,7 +1559,7 @@ def fix_lib64(lib_dir, symlink=True):
if symlink:
os.symlink('lib', lib64_link)
else:
- copyfile('lib', lib64_link)
+ copyfile(lib_dir, lib64_link)
def resolve_interpreter(exe):
"""

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 20 16:29:52 UTC 2018 - mwilck@suse.com
- Fix failure of virtualenv --always-copy (bsc#1102096)
-------------------------------------------------------------------
Wed Feb 21 08:13:12 UTC 2018 - tbechtold@suse.com

View File

@ -25,6 +25,7 @@ Summary: Virtual Python Environment builder
License: MIT
Group: Development/Languages/Python
Source: https://pypi.io/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz
Patch01: pypa-virtualenv-1189.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
@ -60,6 +61,7 @@ libraries either).
%prep
%setup -q -n virtualenv-%{version}
%patch01 -p1
%build
%python_build