| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-29 20:44:08 +0000 (Thu, 29 May 2008) |
| 3 |
New Revision: 10480 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
When --skipfirst drops packages due to unsatisfied dependencies, display |
| 9 |
a warning message with the list of dropped packages. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-29 19:56:42 UTC (rev 10479) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-29 20:44:08 UTC (rev 10480) |
| 16 |
@@ -8363,6 +8363,8 @@ |
| 17 |
del mergelist[i] |
| 18 |
break |
| 19 |
|
| 20 |
+ dropped_tasks = set() |
| 21 |
+ |
| 22 |
success = False |
| 23 |
try: |
| 24 |
while True: |
| 25 |
@@ -8378,11 +8380,12 @@ |
| 26 |
for task in mergelist: |
| 27 |
if isinstance(task, list) and \ |
| 28 |
tuple(task) in unsatisfied_parents: |
| 29 |
- continue |
| 30 |
+ continue |
| 31 |
pruned_mergelist.append(task) |
| 32 |
if not pruned_mergelist: |
| 33 |
raise |
| 34 |
mergelist[:] = pruned_mergelist |
| 35 |
+ dropped_tasks.update(unsatisfied_parents) |
| 36 |
del e |
| 37 |
continue |
| 38 |
else: |
| 39 |
@@ -8439,7 +8442,15 @@ |
| 40 |
if show_spinner: |
| 41 |
print "\b\b... done!" |
| 42 |
|
| 43 |
- if not success: |
| 44 |
+ if success: |
| 45 |
+ if dropped_tasks: |
| 46 |
+ portage.writemsg("!!! One or more packages have been " + \ |
| 47 |
+ "dropped due to unsatisfied dependencies:\n\n", |
| 48 |
+ noiselevel=-1) |
| 49 |
+ for task in dropped_tasks: |
| 50 |
+ portage.writemsg(" " + str(task) + "\n", noiselevel=-1) |
| 51 |
+ portage.writemsg("\n", noiselevel=-1) |
| 52 |
+ else: |
| 53 |
mydepgraph.display_problems() |
| 54 |
if not (ask or pretend): |
| 55 |
# delete the current list and also the backup |
| 56 |
|
| 57 |
-- |
| 58 |
gentoo-commits@l.g.o mailing list |
Archives