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 eb9db58ab5db8994236af5642f218b642af55877..9bc19cdab2e3ce571fdc90e825ea8a1444d28935 100755 (executable)
--- 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"]