From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 13 Mar 2006 00:15:49 +0000 (-0000)
Subject: Fix KeyError: 'mergelist' error (regression from r2847). See bug #125993.
X-Git-Tag: v2.1_pre7~108
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28ba8beadd0f87da18e8ae4366c425917289116c;p=portage.git

Fix KeyError: 'mergelist' error (regression from r2847). See bug #125993.

svn path=/main/trunk/; revision=2864
---

diff --git a/bin/emerge b/bin/emerge
index eb9db58ab..9bc19cdab 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3261,6 +3261,7 @@ else:
 			mydepgraph.merge(portage.mtimedb["resume"]["mergelist"])
 		else:
 			if "resume" in portage.mtimedb and \
+			"mergelist" in portage.mtimedb["resume"] and \
 			len(portage.mtimedb["resume"]["mergelist"]) > 1:
 				portage.mtimedb["resume_backup"] = portage.mtimedb["resume"]
 				del portage.mtimedb["resume"]