From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2AE81138010 for ; Wed, 12 Sep 2012 06:48:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55D6521C003; Wed, 12 Sep 2012 06:48:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1AAAE21C003 for ; Wed, 12 Sep 2012 06:48:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F95F33D323 for ; Wed, 12 Sep 2012 06:48:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 47101E543C for ; Wed, 12 Sep 2012 06:48:15 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1347432352.ea54077b59d2aec35add5c3f6779b6772f3127a5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/EbuildPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ea54077b59d2aec35add5c3f6779b6772f3127a5 X-VCS-Branch: master Date: Wed, 12 Sep 2012 06:48:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 51755fd8-2bf9-4f67-9d3f-99fc4eebbca0 X-Archives-Hash: a83d0c67e121aac9d88d45941f3c65c1 commit: ea54077b59d2aec35add5c3f6779b6772f3127a5 Author: Zac Medico gentoo org> AuthorDate: Mon Sep 10 00:30:19 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 12 06:45:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ea54077b EbuildPhase: fix WORKDIR owner after unpack See bug #332217, comment #24. --- pym/_emerge/EbuildPhase.py | 5 ++++- 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)