From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RcQqy-0004jW-7k for garchives@archives.gentoo.org; Mon, 19 Dec 2011 00:13:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A65DD21C041; Mon, 19 Dec 2011 00:13:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7610C21C041 for ; Mon, 19 Dec 2011 00:13:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C83A11B4046 for ; Mon, 19 Dec 2011 00:13:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EE7D580042 for ; Mon, 19 Dec 2011 00:13:05 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <7a0a0a1dc02487b08f47fef129a29e18f7c226a0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7a0a0a1dc02487b08f47fef129a29e18f7c226a0 Date: Mon, 19 Dec 2011 00:13:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3b567d36-a0cd-44f1-a126-df740b6d6108 X-Archives-Hash: 805dc7b530794be812e89174f455e9bf commit: 7a0a0a1dc02487b08f47fef129a29e18f7c226a0 Author: Zac Medico gentoo org> AuthorDate: Mon Dec 19 00:12:57 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Dec 19 00:12:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7a0a0a1d _run_pkg_pretend: doebuild_environment for clean --- pym/_emerge/Scheduler.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 302b905..3800b8b 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -866,6 +866,20 @@ class Scheduler(PollScheduler): # Clean up the existing build dir, in case pkg_pretend # checks for available space (bug #390711). if existing_buildir: + if x.built: + tree =3D "bintree" + infloc =3D os.path.join(build_dir_path, "build-info") + ebuild_path =3D os.path.join(infloc, x.pf + ".ebuild") + else: + tree =3D "porttree" + portdb =3D root_config.trees["porttree"].dbapi + ebuild_path =3D portdb.findname(x.cpv, myrepo=3Dx.repo) + if ebuild_path is None: + raise AssertionError( + "ebuild not found for '%s'" % x.cpv) + portage.package.ebuild.doebuild.doebuild_environment( + ebuild_path, "clean", settings=3Dsettings, + db=3Dself.trees[settings['EROOT']][tree].dbapi) clean_phase =3D EbuildPhase(background=3DFalse, phase=3D'clean', scheduler=3Dsched_iface, settings=3Dsettings) current_task =3D clean_phase