summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-08-05 08:18:48 +0000
committerMichał Górny <mgorny@gentoo.org>2013-08-05 08:18:48 +0000
commit82d11c745fa6cfb2a55e1e81ea4d23372d47caea (patch)
tree15792e027016b7784f00a977fac8d02d78767a76 /dev-python/setuptools/files
parentVersion bump, update ebuild, verbose build, drop useflags. (diff)
downloadgentoo-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/setuptools/files')
-rw-r--r--dev-python/setuptools/files/setuptools-0.9.8-install_scripts-overwrite.patch24
1 files changed, 24 insertions, 0 deletions
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()
+