Call clear_caches() after the depgraph is out of scope, in MergeTask.merge().

svn path=/main/trunk/; revision=10812

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 16d408b939ed911031f98bc43a96fa0ab58b36a8..7588783ed60cc99beccf487b6fd4d18c8388ae26 100644 (file)
--- 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):