summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/emerge10
1 files changed, 10 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 64a40c7fc..172c6eede 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3262,6 +3262,16 @@ 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]
+
if "--resume" in myopts and \
("resume" in mtimedb or
"resume_backup" in mtimedb):