| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-03 02:14:08 +0000 (Sat, 03 May 2008) |
| 3 |
New Revision: 10115 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix --resume mode to check for unsatisfied blockers and bail out when |
| 9 |
necessary. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-03 01:42:25 UTC (rev 10114) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-03 02:14:08 UTC (rev 10115) |
| 16 |
@@ -7637,6 +7637,10 @@ |
| 17 |
mysettings.lock() |
| 18 |
del myroot, mysettings |
| 19 |
|
| 20 |
+ favorites = mtimedb["resume"].get("favorites") |
| 21 |
+ if not isinstance(favorites, list): |
| 22 |
+ favorites = [] |
| 23 |
+ |
| 24 |
# "myopts" is a list for backward compatibility. |
| 25 |
resume_opts = mtimedb["resume"].get("myopts", []) |
| 26 |
if isinstance(resume_opts, list): |
| 27 |
@@ -7664,6 +7668,21 @@ |
| 28 |
if show_spinner: |
| 29 |
print "\b\b... done!" |
| 30 |
|
| 31 |
+ if success: |
| 32 |
+ mymergelist = mydepgraph.altlist() |
| 33 |
+ if mymergelist and \ |
| 34 |
+ (isinstance(mymergelist[-1], Blocker) and \ |
| 35 |
+ not mymergelist[-1].satisfied): |
| 36 |
+ if not fetchonly and not pretend: |
| 37 |
+ mydepgraph.display( |
| 38 |
+ mydepgraph.altlist(reversed=tree), |
| 39 |
+ favorites=favorites) |
| 40 |
+ print "\n!!! Error: The above package list contains packages which cannot be installed" |
| 41 |
+ print "!!! at the same time on the same system." |
| 42 |
+ if not quiet: |
| 43 |
+ show_blocker_docs_link() |
| 44 |
+ return 1 |
| 45 |
+ |
| 46 |
if not success: |
| 47 |
mydepgraph.display_problems() |
| 48 |
|
| 49 |
|
| 50 |
-- |
| 51 |
gentoo-commits@l.g.o mailing list |
Archives