diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-12 11:36:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-12 11:36:41 +0000 |
| commit | 53437e0bea7bdb74da3ba43f0bd30d2c7d0b9d07 (patch) | |
| tree | a9a8c6c26125ec16eb1175c9bd13506ec214b2e1 /pym | |
| parent | de8ae0f08f8e2941e41760f995416fe199edda33 (diff) | |
| download | portage-53437e0bea7bdb74da3ba43f0bd30d2c7d0b9d07.tar.gz portage-53437e0bea7bdb74da3ba43f0bd30d2c7d0b9d07.tar.bz2 portage-53437e0bea7bdb74da3ba43f0bd30d2c7d0b9d07.zip | |
Set self._mergelist inside Scheduler._calc_resume_list() since it needs to
be set when calling _set_digraph().
svn path=/main/trunk/; revision=11026
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 bc317156b..c68181f9b 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8591,9 +8591,9 @@ class Scheduler(PollScheduler): if not mergelist: break - mylist, dropped_tasks = self._calc_resume_list() + dropped_tasks = self._calc_resume_list() clear_caches(self.trees) - if not mylist: + if not self._mergelist: break if dropped_tasks: @@ -8611,10 +8611,9 @@ class Scheduler(PollScheduler): _eerror(msg) del _eerror, msg del dropped_tasks - self._mergelist = mylist self._save_resume_list() self._pkg_count.curval = 0 - self._pkg_count.maxval = len([x for x in mylist \ + self._pkg_count.maxval = len([x for x in self._mergelist \ if isinstance(x, Package) and x.operation == "merge"]) self._logger.log(" *** Finished. Cleaning up...") @@ -8898,8 +8897,10 @@ class Scheduler(PollScheduler): mydepgraph.break_refs(mylist) mydepgraph.break_refs(dropped_tasks) mydepgraph.break_refs(mydepgraph.digraph.order) + + self._mergelist = mylist self._set_digraph(mydepgraph.digraph) - return (mylist, dropped_tasks) + return dropped_tasks def _show_list(self): myopts = self.myopts |