| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-03 19:52:39 +0000 (Sat, 03 May 2008) |
| 3 |
New Revision: 10138 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix display_problems() logic some more. (trunk r10135:10137) |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/branches/2.1.2/bin/emerge |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.2/bin/emerge 2008-05-03 19:48:13 UTC (rev 10137) |
| 14 |
+++ main/branches/2.1.2/bin/emerge 2008-05-03 19:52:39 UTC (rev 10138) |
| 15 |
@@ -7788,8 +7788,6 @@ |
| 16 |
|
| 17 |
if not success: |
| 18 |
mydepgraph.display_problems() |
| 19 |
- |
| 20 |
- if not success: |
| 21 |
# delete the current list and also the backup |
| 22 |
# since it's probably stale too. |
| 23 |
for k in ("resume", "resume_backup"): |
| 24 |
@@ -7817,10 +7815,6 @@ |
| 25 |
if not retval: |
| 26 |
mydepgraph.display_problems() |
| 27 |
return 1 |
| 28 |
- display = pretend or \ |
| 29 |
- ((ask or tree or verbose) and not (quiet and not ask)) |
| 30 |
- if not display: |
| 31 |
- mydepgraph.display_problems() |
| 32 |
|
| 33 |
if "--pretend" not in myopts and \ |
| 34 |
("--ask" in myopts or "--tree" in myopts or \ |
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives