From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Jun 2008 23:34:55 +0000 (-0000)
Subject: Remove the MergeTask._blocker_db attribute since it can just be a
X-Git-Tag: v2.2_rc2~303
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b271433d653888f140fe8513e2e1171fbeba247c;p=portage.git

Remove the MergeTask._blocker_db attribute since it can just be a
local variable.

svn path=/main/trunk/; revision=10822
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 4b00d2099..cc7ed5b95 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5887,11 +5887,9 @@ class MergeTask(object):
 		if settings.get("PORTAGE_DEBUG", "") == "1":
 			self.edebug = 1
 		self.pkgsettings = {}
-		self._blocker_db = {}
 		for root in trees:
 			self.pkgsettings[root] = portage.config(
 				clone=trees[root]["vartree"].settings)
-			self._blocker_db[root] = BlockerDB(trees[root]["root_config"])
 		self.curval = 0
 		self._spawned_pids = []
 
@@ -5914,10 +5912,11 @@ class MergeTask(object):
 		import gc
 		gc.collect()
 
+		blocker_db = BlockerDB(self.trees[new_pkg.root]["root_config"])
+
 		blocker_dblinks = []
-		for blocking_pkg in self._blocker_db[
-			new_pkg.root].findInstalledBlockers(new_pkg,
-			acquire_lock=acquire_lock):
+		for blocking_pkg in blocker_db.findInstalledBlockers(
+			new_pkg, acquire_lock=acquire_lock):
 			if new_pkg.slot_atom == blocking_pkg.slot_atom:
 				continue
 			if new_pkg.cpv == blocking_pkg.cpv: