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

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-08-22 23:11:23 +0000 (Sat, 22 Aug 2009)
New Revision: 14128

Modified:
   main/trunk/pym/_emerge/Scheduler.py
Log:
Make Scheduler._choose_pkg() prefer uninstall operations when available.


Modified: main/trunk/pym/_emerge/Scheduler.py
===================================================================
--- main/trunk/pym/_emerge/Scheduler.py	2009-08-22 19:41:37 UTC (rev 14127)
+++ main/trunk/pym/_emerge/Scheduler.py	2009-08-22 23:11:23 UTC (rev 14128)
@@ -1164,13 +1164,23 @@
 		self._prune_digraph()
 
 		chosen_pkg = None
-		later = set(self._pkg_queue)
+
+		# Prefer uninstall operations when available.
+		graph = self._digraph
 		for pkg in self._pkg_queue:
-			later.remove(pkg)
-			if not self._dependent_on_scheduled_merges(pkg, later):
+			if pkg.operation == 'uninstall' and \
+				not graph.child_nodes(pkg):
 				chosen_pkg = pkg
 				break
 
+		if chosen_pkg is None:
+			later = set(self._pkg_queue)
+			for pkg in self._pkg_queue:
+				later.remove(pkg)
+				if not self._dependent_on_scheduled_merges(pkg, later):
+					chosen_pkg = pkg
+					break
+
 		if chosen_pkg is not None:
 			self._pkg_queue.remove(chosen_pkg)