From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 15 May 2011 04:39:26 +0000 (-0700)
Subject: movefile: handle EEXIST when os.symlink fails
X-Git-Tag: v2.1.9.50~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=272c1b19b0ab5681c566d8984cfaad1dba9df9fa;p=portage.git

movefile: handle EEXIST when os.symlink fails
---

diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index f8cc695fb..e07e8ca4f 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -90,7 +90,8 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None,
 				# to tolerate these links being recreated during the merge
 				# process. In any case, if the link is pointing at the right
 				# place, we're in good shape.
-				if e.errno != errno.ENOENT or target != os.readlink(dest):
+				if e.errno not in (errno.ENOENT, errno.EEXIST) or \
+					target != os.readlink(dest):
 					raise
 			lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
 			# utime() only works on the target of a symlink, so it's not