summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2002-02-01 18:29:34 (GMT)
committerAndrew M. Kuchling <amk@amk.ca>2002-02-01 18:29:34 (GMT)
commit3b388ec8b3a45ae45c0934ac04627e247762293c (patch)
tree4c29d3fe7081119ddb828222d26336737a3881ab
parent8cb6540652292991b8d1af4b66c125f270a094bf (diff)
downloadcpython-3b388ec8b3a45ae45c0934ac04627e247762293c.zip
cpython-3b388ec8b3a45ae45c0934ac04627e247762293c.tar.gz
cpython-3b388ec8b3a45ae45c0934ac04627e247762293c.tar.bz2
[Bug #220993; may also fix bug #479469] Fix flakiness when old
installations are present, by always unlinking the destination file before copying to it. Without the unlink(), the copied file remains owned by its previous UID, causing the subsequent chmod() to fail. Bugfix candidate, though it may cause changes on platforms where file ownership behaves differently.
-rw-r--r--Lib/distutils/file_util.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py
index 526e4cf..14772fb 100644
--- a/Lib/distutils/file_util.py
+++ b/Lib/distutils/file_util.py
@@ -36,6 +36,13 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
raise DistutilsFileError, \
"could not open '%s': %s" % (src, errstr)
+ if os.path.exists(dst):
+ try:
+ os.unlink(dst)
+ except os.error, (errno, errstr):
+ raise DistutilsFileError, \
+ "could not delete '%s': %s" % (dst, errstr)
+
try:
fdst = open(dst, 'wb')
except os.error, (errno, errstr):