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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-02-26 06:22:39 +0000 (Tue, 26 Feb 2008)
New Revision: 9385

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
For depclean/prune unmerge order, if there are no dependencies between
package then just unmerge them alphabetically.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-02-26 00:02:53 UTC (rev 9384)
+++ main/trunk/pym/_emerge/__init__.py	2008-02-26 06:22:39 UTC (rev 9385)
@@ -6664,34 +6664,40 @@
 						if cpv in clean_set:
 							graph.add(cpv, node, priority=priority)
 
-		# Order nodes from lowest to highest overall reference count for
-		# optimal root node selection.
-		node_refcounts = {}
-		for node in graph.order:
-			node_refcounts[node] = len(graph.parent_nodes(node))
-		def cmp_reference_count(node1, node2):
-			return node_refcounts[node1] - node_refcounts[node2]
-		graph.order.sort(cmp_reference_count)
+		if len(graph.order) == len(graph.root_nodes()):
+			# If there are no dependencies between packages
+			# then just unmerge them alphabetically.
+			cleanlist = graph.order[:]
+			cleanlist.sort()
+		else:
+			# Order nodes from lowest to highest overall reference count for
+			# optimal root node selection.
+			node_refcounts = {}
+			for node in graph.order:
+				node_refcounts[node] = len(graph.parent_nodes(node))
+			def cmp_reference_count(node1, node2):
+				return node_refcounts[node1] - node_refcounts[node2]
+			graph.order.sort(cmp_reference_count)
+	
+			ignore_priority_range = [None]
+			ignore_priority_range.extend(
+				xrange(UnmergeDepPriority.MIN, UnmergeDepPriority.MAX + 1))
+			while not graph.empty():
+				for ignore_priority in ignore_priority_range:
+					nodes = graph.root_nodes(ignore_priority=ignore_priority)
+					if nodes:
+						break
+				if not nodes:
+					raise AssertionError("no root nodes")
+				if ignore_priority is not None:
+					# Some deps have been dropped due to circular dependencies,
+					# so only pop one node in order do minimize the number that
+					# are dropped.
+					del nodes[1:]
+				for node in nodes:
+					graph.remove(node)
+					cleanlist.append(node)
 
-		ignore_priority_range = [None]
-		ignore_priority_range.extend(
-			xrange(UnmergeDepPriority.MIN, UnmergeDepPriority.MAX + 1))
-		while not graph.empty():
-			for ignore_priority in ignore_priority_range:
-				nodes = graph.root_nodes(ignore_priority=ignore_priority)
-				if nodes:
-					break
-			if not nodes:
-				raise AssertionError("no root nodes")
-			if ignore_priority is not None:
-				# Some deps have been dropped due to circular dependencies,
-				# so only pop one node in order do minimize the number that
-				# are dropped.
-				del nodes[1:]
-			for node in nodes:
-				graph.remove(node)
-				cleanlist.append(node)
-
 		unmerge(root_config, myopts,
 			"unmerge", cleanlist, ldpath_mtimes)
 

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