| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-03 02:24:40 +0000 (Sat, 03 May 2008) |
| 3 |
New Revision: 10117 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Delete the resume list(s) if there is an unsatisfied block. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-03 02:17:23 UTC (rev 10116) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-03 02:24:40 UTC (rev 10117) |
| 15 |
@@ -7669,12 +7669,14 @@ |
| 16 |
if show_spinner: |
| 17 |
print "\b\b... done!" |
| 18 |
|
| 19 |
+ unsatisfied_block = False |
| 20 |
if success: |
| 21 |
mymergelist = mydepgraph.altlist() |
| 22 |
if mymergelist and \ |
| 23 |
(isinstance(mymergelist[-1], Blocker) and \ |
| 24 |
not mymergelist[-1].satisfied): |
| 25 |
if not fetchonly and not pretend: |
| 26 |
+ unsatisfied_block = True |
| 27 |
mydepgraph.display( |
| 28 |
mydepgraph.altlist(reversed=tree), |
| 29 |
favorites=favorites) |
| 30 |
@@ -7682,11 +7684,11 @@ |
| 31 |
print "!!! at the same time on the same system." |
| 32 |
if not quiet: |
| 33 |
show_blocker_docs_link() |
| 34 |
- return 1 |
| 35 |
|
| 36 |
if not success: |
| 37 |
mydepgraph.display_problems() |
| 38 |
|
| 39 |
+ if unsatisfied_block or not success: |
| 40 |
# delete the current list and also the backup |
| 41 |
# since it's probably stale too. |
| 42 |
for k in ("resume", "resume_backup"): |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives