From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 5 May 2008 06:00:20 +0000 (-0000)
Subject: * Fix --buildpkgonly logic to avoid an unwanted code path.
X-Git-Tag: v2.1.5~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a04c91bb0d2dd2bd572a8b102faa8331ffaac53;p=portage.git

* Fix --buildpkgonly logic to avoid an unwanted code path.
* Remove unnecessary mtimedb.pop("resume", None) call.
(trunk r10194)

svn path=/main/branches/2.1.2/; revision=10196
---

diff --git a/bin/emerge b/bin/emerge
index 39bb111a7..89e9a6430 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -8167,8 +8167,7 @@ def action_build(settings, trees, mtimedb,
 			retval = mergetask.merge(pkglist, favorites, mtimedb)
 			merge_count = mergetask.curval
 
-		if retval == os.EX_OK and not (pretend or fetchonly):
-			mtimedb.pop("resume", None)
+		if retval == os.EX_OK and not (buildpkgonly or fetchonly or pretend):
 			if "yes" == settings.get("AUTOCLEAN"):
 				portage.writemsg_stdout(">>> Auto-cleaning packages...\n")
 				vartree = trees[settings["ROOT"]]["vartree"]