summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-13 00:15:49 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-13 00:15:49 +0000
commit28ba8beadd0f87da18e8ae4366c425917289116c (patch)
treec46729a2919881a86606df13e0d8b7ce9b373801
parent4c2440dcd54008518522dd2ba9f6593a85ebd6fd (diff)
downloadportage-28ba8beadd0f87da18e8ae4366c425917289116c.tar.gz
portage-28ba8beadd0f87da18e8ae4366c425917289116c.tar.bz2
portage-28ba8beadd0f87da18e8ae4366c425917289116c.zip
Fix KeyError: 'mergelist' error (regression from r2847). See bug #125993.
svn path=/main/trunk/; revision=2864
-rwxr-xr-xbin/emerge1
1 files changed, 1 insertions, 0 deletions
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"]