* 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 39bb111a7117a68cdf0bdf623ead3b333e465490..89e9a64309ed6994cfd807cf5ed550913f2599c6 100755 (executable)
--- 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"]