From 7b155ce81759094a41c285980fb2253223186d83 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 28 Apr 2007 01:46:45 +0000 Subject: For bug #176305, validate the resume merge list before attempting to verify the ebuild manifests. (trunk r6443:6444) svn path=/main/branches/2.1.2/; revision=6445 --- bin/emerge | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index ddbc6b19d..c04649dd8 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2889,6 +2889,17 @@ class MergeTask(object): show_blocker_docs_link() return 1 + if "--resume" in self.myopts: + # We're resuming. + print colorize("GOOD", "*** Resuming merge...") + emergelog(xterm_titles, " *** Resuming merge...") + mymergelist = mtimedb["resume"]["mergelist"][:] + if "--skipfirst" in self.myopts and mymergelist: + del mtimedb["resume"]["mergelist"][0] + del mymergelist[0] + mtimedb.commit() + validate_merge_list(self.trees, mymergelist) + # Verify all the manifests now so that the user is notified of failure # as soon as possible. if "--fetchonly" not in self.myopts and \ @@ -2902,7 +2913,7 @@ class MergeTask(object): quiet_config.backup_changes("PORTAGE_QUIET") quiet_settings[myroot] = quiet_config del quiet_config - for x in mylist: + for x in mymergelist: if x[0] != "ebuild" or x[-1] == "nomerge": continue if not shown_verifying_msg: @@ -2919,17 +2930,7 @@ class MergeTask(object): #buildsyspkg: I need mysysdict also on resume (moved from the else block) mysysdict = genericdict(getlist(self.settings, "system")) - if "--resume" in self.myopts: - # We're resuming. - print colorize("GOOD", "*** Resuming merge...") - emergelog(xterm_titles, " *** Resuming merge...") - mymergelist=mtimedb["resume"]["mergelist"][:] - if "--skipfirst" in self.myopts and mymergelist: - del mtimedb["resume"]["mergelist"][0] - del mymergelist[0] - mtimedb.commit() - validate_merge_list(self.trees, mymergelist) - else: + if "--resume" not in self.myopts: myfavs = portage.grabfile( os.path.join(self.target_root, portage.WORLD_FILE)) myfavdict=genericdict(myfavs) -- cgit v1.2.3-1-g7c22