diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-05-03 03:47:21 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-05-03 03:47:21 +0000 |
commit | 72b729a3672de9b6c9a57055188b0f98c48ce5bf (patch) | |
tree | 677748671b99168c7d60e5bb3673817072fc26cd | |
parent | 33c35aee30b9780bb1481ba1b136b0b27274f579 (diff) | |
download | portage-72b729a3672de9b6c9a57055188b0f98c48ce5bf.tar.gz portage-72b729a3672de9b6c9a57055188b0f98c48ce5bf.tar.bz2 portage-72b729a3672de9b6c9a57055188b0f98c48ce5bf.zip |
Also move mtimedb resume list validation earlier.
svn path=/main/trunk/; revision=10124
-rw-r--r-- | pym/_emerge/__init__.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index b5e27b459..f1ce40914 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7576,6 +7576,16 @@ def action_depclean(settings, trees, ldpath_mtimes, def action_build(settings, trees, mtimedb, myopts, myaction, myfiles, spinner): + # validate the state of the resume data + # so that we can make assumptions later. + for k in ("resume", "resume_backup"): + if k in mtimedb: + if "mergelist" in mtimedb[k]: + if not mtimedb[k]["mergelist"]: + del mtimedb[k] + else: + del mtimedb[k] + resume = False if "--resume" in myopts and \ ("resume" in mtimedb or @@ -7650,16 +7660,6 @@ def action_build(settings, trees, mtimedb, print darkgreen("These are the packages that would be %s, in order:") % action print - # validate the state of the resume data - # so that we can make assumptions later. - for k in ("resume", "resume_backup"): - if k in mtimedb: - if "mergelist" in mtimedb[k]: - if not mtimedb[k]["mergelist"]: - del mtimedb[k] - else: - del mtimedb[k] - show_spinner = "--quiet" not in myopts and "--nodeps" not in myopts if not show_spinner: spinner.update = spinner.update_quiet |