diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-04 19:06:17 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-04 19:06:17 +0000 |
| commit | 906087bf0ccb91102617e35b570cd618e5efd8b2 (patch) | |
| tree | afcf1d2dda4daf2ca67dbf617f552882e42c4e79 | |
| parent | Fixed parallel building, no more forced stripping, added a missing header for... (diff) | |
| download | gentoo-2-906087bf0ccb91102617e35b570cd618e5efd8b2.tar.gz gentoo-2-906087bf0ccb91102617e35b570cd618e5efd8b2.tar.bz2 gentoo-2-906087bf0ccb91102617e35b570cd618e5efd8b2.zip | |
Update patch (bug #287439).
(Portage version: 14926-svn/cvs/Linux x86_64)
| -rw-r--r-- | dev-python/setuptools/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog index 1bdc85d548ec..08e4760a2e5f 100644 --- a/dev-python/setuptools/ChangeLog +++ b/dev-python/setuptools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/setuptools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.89 2009/11/18 17:05:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.90 2009/12/04 19:06:17 arfrever Exp $ + + 04 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + files/distribute-0.6.8-C_locale_tests.patch: + Update patch (bug #287439). 18 Nov 2009; Raúl Porcel <armin76@gentoo.org> setuptools-0.6.6.ebuild: ia64/s390/sh/sparc stable wrt #291915 diff --git a/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch b/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch index 2580e355486d..14ed38adc3ab 100644 --- a/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch +++ b/dev-python/setuptools/files/distribute-0.6.8-C_locale_tests.patch @@ -1,10 +1,13 @@ +https://bitbucket.org/tarek/distribute/issue/103/ + --- setuptools/tests/test_resources.py +++ setuptools/tests/test_resources.py -@@ -536,6 +536,8 @@ +@@ -536,6 +536,9 @@ '#!%s -x\n' % self.non_ascii_exe) def test_get_script_header_jython_workaround(self): -+ if os.environ.get("LC_ALL") == "C": ++ # This test doesn't work with Python 3 in some locales ++ if sys.version_info >= (3,) and os.environ.get("LC_CTYPE") in (None, "C", "POSIX"): + return platform = sys.platform sys.platform = 'java1.5.0_13' |