From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 10 Sep 2012 00:30:19 +0000 (-0700)
Subject: EbuildPhase: fix WORKDIR owner after unpack
X-Git-Tag: v2.2.0_alpha126~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea54077b59d2aec35add5c3f6779b6772f3127a5;p=portage.git

EbuildPhase: fix WORKDIR owner after unpack

See bug #332217, comment #24.
---

diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 84e801898..61e9a6f84 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -11,6 +11,7 @@ from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
 from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from _emerge.EbuildProcess import EbuildProcess
 from _emerge.CompositeTask import CompositeTask
+from portage.package.ebuild.prepare_build_dirs import _prepare_workdir
 from portage.util import writemsg
 
 try:
@@ -216,8 +217,10 @@ class EbuildPhase(CompositeTask):
 		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.
+			# comparisons as reported in bug #332217. Also, fix
+			# ownership since tar can change that too.
 			os.utime(settings["WORKDIR"], None)
+			_prepare_workdir(settings)
 		elif self.phase == "install":
 			out = io.StringIO()
 			_post_src_install_write_metadata(settings)