From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 9 Sep 2012 00:54:10 +0000 (-0700)
Subject: EbuildPhase: bump WORKDIR timestamp after unpack
X-Git-Tag: v2.2.0_alpha126~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a54703a8b28326bd428327f68e726238eba02df;p=portage.git

EbuildPhase: bump WORKDIR timestamp after unpack

This will fix bug #332217.
---

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index fe44abcbd..c4881d465 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import gzip
 import io
 import sys
 import tempfile
+import time
 
 from _emerge.AsynchronousLock import AsynchronousLock
 from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
@@ -213,7 +214,13 @@ class EbuildPhase(CompositeTask):
 		settings = self.settings
 		_post_phase_userpriv_perms(settings)
 
-		if self.phase == "install":
+		if self.phase == "unpack":
+			# Bump WORKDIR timestamp, in case tar gave it a timestamp
+			# that will interfere with distfiles / WORKDIR timestamp
+			# comparisons as reported in bug #332217.
+			timestamp = time.time()
+			os.utime(settings["WORKDIR"], (timestamp, timestamp))
+		elif self.phase == "install":
 			out = io.StringIO()
 			_post_src_install_write_metadata(settings)
 			_post_src_install_uid_fix(settings, out)