diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-04-28 01:57:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-04-28 01:57:56 +0000 |
| commit | 46e9c3ee8d4b87e43833cc335d5668320a25d90c (patch) | |
| tree | 057562a53836f9bcf1691d0cc038923157368e5a /pym | |
| parent | 3cf1f6a156feaa8db43502eb272d4d5fe4952f7a (diff) | |
| download | portage-46e9c3ee8d4b87e43833cc335d5668320a25d90c.tar.gz portage-46e9c3ee8d4b87e43833cc335d5668320a25d90c.tar.bz2 portage-46e9c3ee8d4b87e43833cc335d5668320a25d90c.zip | |
Fix up missing mymergelist variable from the previous commit.
svn path=/main/trunk/; revision=6446
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index c4d72d22d..7ca5ece18 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2921,12 +2921,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. @@ -2941,7 +2942,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: |