[gentoo-commits] portage r10823 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-27 23:42:29 +0000 (Fri, 27 Jun 2008)
New Revision: 10823

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Fix depgraph.break_refs() to work with DependencyArg instances (or anything
else that may have a "root_config" attribute).


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-06-27 23:34:55 UTC (rev 10822)
+++ main/trunk/pym/_emerge/__init__.py	2008-06-27 23:42:29 UTC (rev 10823)
@@ -3862,26 +3862,24 @@
 			retlist.reverse()
 		return retlist
 
-	def break_refs(self, mergelist):
+	def break_refs(self, nodes):
 		"""
 		Take a mergelist like that returned from self.altlist() and
 		break any references that lead back to the depgraph. This is
 		useful if you want to hold references to packages without
 		also holding the depgraph on the heap.
 		"""
-		for node in mergelist:
-			if not isinstance(node, Package):
-				continue
+		for node in nodes:
+			if hasattr(node, "root_config"):
+				# The FakeVartree references the _package_cache which
+				# references the depgraph. So that Package instances don't
+				# hold the depgraph and FakeVartree on the heap, replace
+				# the RootConfig that references the FakeVartree with the
+				# original RootConfig instance which references the actual
+				# vartree.
+				node.root_config = \
+					self._trees_orig[node.root_config.root]["root_config"]
 
-			# The FakeVartree references the _package_cache which
-			# references the depgraph. So that Package instances don't
-			# hold the depgraph and FakeVartree on the heap, replace
-			# the RootConfig that references the FakeVartree with the
-			# original RootConfig instance which references the actual
-			# vartree.
-			node.root_config = \
-				self._trees_orig[node.root]["root_config"]
-
 	def _resolve_conflicts(self):
 		if not self._complete_graph():
 			raise self._unknown_internal_error()

-- 
gentoo-commits@l.g.o mailing list