Also move mtimedb resume list validation earlier.

svn path=/main/trunk/; revision=10124

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index b5e27b459fad5b4de1827e13f17df1883fef614b..f1ce409144bd188f8bc37df924100c458950d779 100644 (file)
--- 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