From: Zac Medico Date: Mon, 3 Jul 2006 19:26:30 +0000 (-0000) Subject: Do some basic validation of the mtimedb resume data so that assumptions can be made... X-Git-Tag: v2.1.1~291 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=82ed60c63dc253ab9365efb8f69fd49153469b7d;p=portage.git Do some basic validation of the mtimedb resume data so that assumptions can be made later. svn path=/main/trunk/; revision=3779 --- 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):