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 75354138BD3 for ; Wed, 5 Nov 2014 06:34:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51395E08FE; Wed, 5 Nov 2014 06:34:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD973E07EB for ; Wed, 5 Nov 2014 06:34:09 +0000 (UTC) Received: from localhost.localdomain (ip70-181-96-121.oc.oc.cox.net [70.181.96.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 68703340444; Wed, 5 Nov 2014 06:34:07 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] doebuild: fix bug #528272 Date: Tue, 4 Nov 2014 22:33:57 -0800 Message-Id: <1415169237-776-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.0.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 4246ef94-1bef-423f-8fb7-26dac1ca7fe6 X-Archives-Hash: 8171269cd5fe8396be309bc46c98e36c The doebuild function has a boolean "unpacked" variable which it sets to True if it determines that the "unpack" phase has already executed and the last modification times of the distfiles are older than the last modification time of WORKDIR. The code which sets the "unpacked" flag does not need to run unless the current phase is supposed to have a build directory. Therefore, disable this code for all phases that are not supposed to have a build directory. This fixes incorrect behavior of the "fetch" phase as reported in bug #528272. X-Gentoo-Bug: 528272 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=528272 --- pym/portage/package/ebuild/doebuild.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 544d193..6df3c69 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -829,7 +829,8 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0, alist = set(mysettings.configdict["pkg"].get("A", "").split()) unpacked = False - if tree != "porttree": + if tree != "porttree" or \ + mydo in _doebuild_commands_without_builddir: pass elif "unpack" not in phases_to_run: unpacked = os.path.exists(os.path.join( -- 2.0.4