summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-05 06:00:20 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-05 06:00:20 +0000
commit9a04c91bb0d2dd2bd572a8b102faa8331ffaac53 (patch)
tree549b7bb1c85e5f45209db4969ea0bdc2fa0e23f5 /bin/emerge
parent524bc877010dc4c7cc2d29617bd1edf57ade35f2 (diff)
downloadportage-9a04c91bb0d2dd2bd572a8b102faa8331ffaac53.tar.gz
portage-9a04c91bb0d2dd2bd572a8b102faa8331ffaac53.tar.bz2
portage-9a04c91bb0d2dd2bd572a8b102faa8331ffaac53.zip
* 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
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge3
1 files changed, 1 insertions, 2 deletions
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"]