diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:53:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 05:53:05 +0000 |
| commit | 992b462024722497068b71a7a5e8b81f2dc2e132 (patch) | |
| tree | 0aa240fb1b72b9830015d505a57c15201f98f935 /pym/_emerge/__init__.py | |
| parent | f94a9b473eacc154f7ffd6b6ecec06778997444f (diff) | |
| download | portage-992b462024722497068b71a7a5e8b81f2dc2e132.tar.gz portage-992b462024722497068b71a7a5e8b81f2dc2e132.tar.bz2 portage-992b462024722497068b71a7a5e8b81f2dc2e132.zip | |
Tweak code to avoid python-3.0 errors like this one:
SyntaxError: can not delete variable 'e' referenced in nested scope
(trunk r12644)
svn path=/main/branches/2.1.6/; revision=12916
Diffstat (limited to 'pym/_emerge/__init__.py')
| -rw-r--r-- | pym/_emerge/__init__.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 69f29ae7b..977fae257 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -11147,7 +11147,11 @@ class Scheduler(PollScheduler): success, mydepgraph, dropped_tasks = resume_depgraph( self.settings, self.trees, self._mtimedb, self.myopts, myparams, self._spinner) - except depgraph.UnsatisfiedResumeDep, e: + except depgraph.UnsatisfiedResumeDep, exc: + # rename variable to avoid python-3.0 error: + # SyntaxError: can not delete variable 'e' referenced in nested + # scope + e = exc mydepgraph = e.depgraph dropped_tasks = set() @@ -13653,9 +13657,11 @@ def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner): unsatisfied_parents[parent_node] = parent_node unsatisfied_stack.append(parent_node) - pruned_mergelist = [x for x in mergelist \ + pruned_mergelist = [] + for x in mergelist: if isinstance(x, list) and \ - tuple(x) not in unsatisfied_parents] + tuple(x) not in unsatisfied_parents: + pruned_mergelist.append(x) # If the mergelist doesn't shrink then this loop is infinite. if len(pruned_mergelist) == len(mergelist): |