From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 Apr 2008 07:32:46 +0000 (-0000)
Subject: Make movefile() tolerant to EPERM errors that can be raised from utime()
X-Git-Tag: v2.2_pre6~175
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8776a5df44d20a26db156f6803172917df5f1ad;p=portage.git

Make movefile() tolerant to EPERM errors that can be raised from utime()
calls. Instead of failing, use stat() to return the mtime if possible.

svn path=/main/trunk/; revision=9864
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 92cacf76e..6a6d088d7 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5211,11 +5211,22 @@ def movefile(src,dest,newmtime=None,sstat=None,mysettings=None):
 			print "!!!",e
 			return None
 
-	if newmtime:
-		os.utime(dest,(newmtime,newmtime))
-	else:
-		os.utime(dest, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME]))
-		newmtime=sstat[stat.ST_MTIME]
+	try:
+		if newmtime is not None:
+			os.utime(dest, (newmtime, newmtime))
+		else:
+			os.utime(dest, (sstat.st_atime, sstat.st_mtime))
+			newmtime = long(sstat.st_mtime)
+	except OSError:
+		# The utime can fail here with EPERM even though the move succeeded.
+		# Instead of failing, use stat to return the mtime if possible.
+		try:
+			newmtime = os.stat(dest).st_mtime
+		except OSError, e:
+			writemsg("!!! Failed to stat in movefile()\n", noiselevel=-1)
+			writemsg("!!! %s\n" % dest, noiselevel=-1)
+			writemsg("!!! %s\n" % str(e), noiselevel=-1)
+			return None
 
 	if bsd_chflags:
 		# Restore the flags we saved before moving