diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-08-05 08:18:48 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-08-05 08:18:48 +0000 |
| commit | 82d11c745fa6cfb2a55e1e81ea4d23372d47caea (patch) | |
| tree | 15792e027016b7784f00a977fac8d02d78767a76 /dev-python | |
| parent | Version bump, update ebuild, verbose build, drop useflags. (diff) | |
| download | gentoo-2-82d11c745fa6cfb2a55e1e81ea4d23372d47caea.tar.gz gentoo-2-82d11c745fa6cfb2a55e1e81ea4d23372d47caea.tar.bz2 gentoo-2-82d11c745fa6cfb2a55e1e81ea4d23372d47caea.zip | |
Backport patch fixing python-exec overwrite, bug #468378.
(Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/setuptools/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch | 24 | ||||
| -rw-r--r-- | dev-python/setuptools/setuptools-0.9.8-r1.ebuild (renamed from dev-python/setuptools/setuptools-0.9.8.ebuild) | 6 |
3 files changed, 37 insertions, 2 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog index 8fd3bd43bf06..ac0cc8ce1bd3 100644 --- a/dev-python/setuptools/ChangeLog +++ b/dev-python/setuptools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/setuptools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.197 2013/07/26 00:45:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.198 2013/08/05 08:18:48 mgorny Exp $ + +*setuptools-0.9.8-r1 (05 Aug 2013) + + 05 Aug 2013; Michał Górny <mgorny@gentoo.org> + +files/setuptools-0.9.8-install_scripts-overwrite.patch, + +setuptools-0.9.8-r1.ebuild, -setuptools-0.9.8.ebuild: + Backport patch fixing python-exec overwrite, bug #468378. *setuptools-0.9.8 (26 Jul 2013) diff --git a/dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch b/dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch new file mode 100644 index 000000000000..a1cc30ad5ff5 --- /dev/null +++ b/dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch @@ -0,0 +1,24 @@ +# HG changeset patch +# User Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> +# Date 1375688645 -7200 +# Mon Aug 05 09:44:05 2013 +0200 +# Node ID af6c2bd582e4ed09d30319c9742144c0491562af +# Parent 648bb1e6fcb9132483680998858f4b9e083e9c44 +# Parent 13f77d26065af56983aeecc37021fbcbbad3fa99 +Merged in mgorny/setuptools-overwrite-fix (pull request #10) + +Unlink destination file before writing scripts. + +diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py +--- a/setuptools/command/easy_install.py ++++ b/setuptools/command/easy_install.py +@@ -799,6 +799,8 @@ + mask = current_umask() + if not self.dry_run: + ensure_directory(target) ++ if os.path.exists(target): ++ os.unlink(target) + f = open(target,"w"+mode) + f.write(contents) + f.close() + diff --git a/dev-python/setuptools/setuptools-0.9.8.ebuild b/dev-python/setuptools/setuptools-0.9.8-r1.ebuild index f8947effddf5..a0b6eb337b0c 100644 --- a/dev-python/setuptools/setuptools-0.9.8.ebuild +++ b/dev-python/setuptools/setuptools-0.9.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.9.8.ebuild,v 1.1 2013/07/26 00:45:11 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.9.8-r1.ebuild,v 1.1 2013/08/05 08:18:48 mgorny Exp $ EAPI="5" PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} ) @@ -21,6 +21,10 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) python_prepare_all() { + local PATCHES=( + "${FILESDIR}"/${PN}-0.9.8-install_scripts-overwrite.patch + ) + # Disable tests requiring network connection. rm -f setuptools/tests/test_packageindex.py |