Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
Author: zmedico
Date: 2008-07-08 23:42:28 +0000 (Tue, 08 Jul 2008)
New Revision: 10994
Modified:
main/trunk/pym/_emerge/__init__.py
Log:
* Fix _choose_pkg() to pop the first node if there are no other jobs running.
* Allow _choose_pkg() to choose an uninstall node when it reaches the front
of the queue. TODO: fix order for uninstall operations.
* Fix _dependent_on_scheduled_merges() to handle direct circular deps
correctly.
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-07-08 22:35:27 UTC (rev 10993)
+++ main/trunk/pym/_emerge/__init__.py 2008-07-08 23:42:28 UTC (rev 10994)
@@ -8102,7 +8102,11 @@
return rval
def _choose_pkg(self):
- if self._max_jobs < 2:
+ """
+ TODO: fix order for uninstall operations
+ """
+ if self._max_jobs < 2 or self._jobs == 0 or \
+ self._pkg_queue[0].operation == "uninstall":
return self._pkg_queue.pop(0)
self._prune_digraph()
@@ -8131,7 +8135,7 @@
completed_tasks = self._completed_tasks
dependent = False
- traversed_nodes = set()
+ traversed_nodes = set([pkg])
node_stack = graph.child_nodes(pkg)
while node_stack:
node = node_stack.pop()
--
gentoo-commits@g.o mailing list
|
|
