From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Jun 2008 08:04:12 +0000 (-0000)
Subject: Call clear_caches() after the depgraph is out of scope, in MergeTask.merge().
X-Git-Tag: v2.2_rc2~309
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=114085e4fa6f702ea251fb3aae6335801e698f79;p=portage.git

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 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):