| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-29 20:52:05 +0000 (Tue, 29 Jul 2008) |
| 3 |
New Revision: 11272 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix _choose_pkg() to always return something if nothing is running or merging. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-29 20:24:43 UTC (rev 11271) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-29 20:52:05 UTC (rev 11272) |
| 15 |
@@ -9568,6 +9568,9 @@ |
| 16 |
return None |
| 17 |
return self._pkg_queue.pop(0) |
| 18 |
|
| 19 |
+ if not (self._jobs or self._task_queues.merge): |
| 20 |
+ return self._pkg_queue.pop(0) |
| 21 |
+ |
| 22 |
self._prune_digraph() |
| 23 |
|
| 24 |
chosen_pkg = None |
Archives