summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2000-09-22 00:46:18 +0000
committerDaniel Robbins <drobbins@gentoo.org>2000-09-22 00:46:18 +0000
commit3c884ba2ead7e3b8655d5982f07110585b0cb6be (patch)
treec75105954f825279ac1df7b660d4407843c63929
parentmerge now unlinks files before writing over them. SHould prevent (diff)
downloadhistorical-3c884ba2ead7e3b8655d5982f07110585b0cb6be.tar.gz
historical-3c884ba2ead7e3b8655d5982f07110585b0cb6be.tar.bz2
historical-3c884ba2ead7e3b8655d5982f07110585b0cb6be.zip
fix
-rwxr-xr-xsys-apps/portage/files/portage-merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys-apps/portage/files/portage-merge b/sys-apps/portage/files/portage-merge
index 9ab6aa07ca9e..fe6dfbaea53c 100755
--- a/sys-apps/portage/files/portage-merge
+++ b/sys-apps/portage/files/portage-merge
@@ -30,7 +30,7 @@ def isfifo(x):
def movefile(src,dest):
if os.path.exists(dest):
- unlink(dest)
+ os.unlink(dest)
mystat=os.stat(src)
mymode=mystat[ST_MODE]
myperms=S_IMODE(mymode)