diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-28 01:58:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-28 01:58:22 +0000 |
| commit | 51a9e9fc538228418817613c2695e89264afd15f (patch) | |
| tree | 6d80f039ed931f1fdec060004ff568c120183512 /bin | |
| parent | 7b155ce81759094a41c285980fb2253223186d83 (diff) | |
| download | portage-51a9e9fc538228418817613c2695e89264afd15f.tar.gz portage-51a9e9fc538228418817613c2695e89264afd15f.tar.bz2 portage-51a9e9fc538228418817613c2695e89264afd15f.zip | |
Fix up missing mymergelist variable from the previous commit. (trunk r6445:6446)
svn path=/main/branches/2.1.2/; revision=6447
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index c04649dd8..0e40a955d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2893,12 +2893,13 @@ class MergeTask(object): # We're resuming. print colorize("GOOD", "*** Resuming merge...") emergelog(xterm_titles, " *** Resuming merge...") - mymergelist = mtimedb["resume"]["mergelist"][:] - if "--skipfirst" in self.myopts and mymergelist: + mylist = mtimedb["resume"]["mergelist"][:] + if "--skipfirst" in self.myopts and mylist: del mtimedb["resume"]["mergelist"][0] - del mymergelist[0] + del mylist[0] mtimedb.commit() - validate_merge_list(self.trees, mymergelist) + validate_merge_list(self.trees, mylist) + mymergelist = mylist # Verify all the manifests now so that the user is notified of failure # as soon as possible. @@ -2913,7 +2914,7 @@ class MergeTask(object): quiet_config.backup_changes("PORTAGE_QUIET") quiet_settings[myroot] = quiet_config del quiet_config - for x in mymergelist: + for x in mylist: if x[0] != "ebuild" or x[-1] == "nomerge": continue if not shown_verifying_msg: |