diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-27 08:04:12 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-27 08:04:12 +0000 |
| commit | 114085e4fa6f702ea251fb3aae6335801e698f79 (patch) | |
| tree | c02810ca0eedabee26781585535c001982d06c9a | |
| parent | bf2604c94ce49f0476579fa24397e12f3272ef4e (diff) | |
| download | portage-114085e4fa6f702ea251fb3aae6335801e698f79.tar.gz portage-114085e4fa6f702ea251fb3aae6335801e698f79.tar.bz2 portage-114085e4fa6f702ea251fb3aae6335801e698f79.zip | |
Call clear_caches() after the depgraph is out of scope, in MergeTask.merge().
svn path=/main/trunk/; revision=10812
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 16d408b93..7588783ed 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5963,6 +5963,7 @@ class MergeTask(object): if not mergelist: break mylist = self._calc_resume_list() + clear_caches(self.trees) if not mylist: break self.curval += 1 @@ -6006,8 +6007,6 @@ class MergeTask(object): mylist = mydepgraph.altlist() mydepgraph.break_refs(mylist) - del mydepgraph - clear_caches(self.trees) return mylist def _poll_child_processes(self): |