pool/python-setuptools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 406690 from home:lorenz:ELPA

Browse Source 
Fix build on SLE-11-SP4

OBS-URL: https://build.opensuse.org/request/show/406690
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=97
This commit is contained in:
Thomas Bechtold 2016-07-05 09:43:28 +00:00 committed by Git OBS Bridge
parent 8308d5e140
commit d22ca0e1c4
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fix-sle11-test-failure.patch
View File

@ -2,16 +2,14 @@ This fixes a test failure on SLE11SP3:
Error is:
AssertionError: error: must supply either home or prefix/exec-prefix -- not both
Index: setuptools-15.0/setuptools/tests/test_egg_info.py
===================================================================
--- setuptools-15.0.orig/setuptools/tests/test_egg_info.py
+++ setuptools-15.0/setuptools/tests/test_egg_info.py
@@ -61,7 +61,7 @@ class TestEggInfo:
)
cmd = [
'install',
- '--home', env.paths['home'],
+ '--prefix', env.paths['home'],
'--install-lib', env.paths['lib'],
'--install-scripts', env.paths['scripts'],
'--install-data', env.paths['data'],
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -217,7 +217,7 @@ class TestEggInfo(object):
if cmd is None:
cmd = [
'install',
- '--home', env.paths['home'],
+ '--prefix', env.paths['home'],
'--install-lib', env.paths['lib'],
'--install-scripts', env.paths['scripts'],
'--install-data', env.paths['data'],

6
python-setuptools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 4 10:11:11 UTC 2016 - dev@stellardeath.org
- Update fix-sle11-test-failure.patch to new line numbers and
indentation
-------------------------------------------------------------------
Mon Jul 4 08:57:47 UTC 2016 - tbechtold@suse.com