aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-10 00:30:19 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-09-12 06:45:52 (GMT)
commitea54077b59d2aec35add5c3f6779b6772f3127a5 (patch)
tree44a591ceb69796cdafa48895c948dfd8bda6b4b9
parentchflags: fixed octal flags format breakage (diff)
downloadportage-ea54077b59d2aec35add5c3f6779b6772f3127a5.zip
portage-ea54077b59d2aec35add5c3f6779b6772f3127a5.tar.gz
portage-ea54077b59d2aec35add5c3f6779b6772f3127a5.tar.bz2
EbuildPhase: fix WORKDIR owner after unpack
See bug #332217, comment #24.
-rw-r--r--pym/_emerge/EbuildPhase.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 84e8018..61e9a6f 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)