| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-03 23:11:54 +0000 (Sat, 03 May 2008) |
| 3 |
New Revision: 10146 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
When a resume list is rejected, display the invalid resume list data |
| 9 |
in case the user is interested. This is enabled with --verbose or |
| 10 |
--debug. (trunk r10145) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-03 23:09:17 UTC (rev 10145) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-03 23:11:54 UTC (rev 10146) |
| 17 |
@@ -4920,7 +4920,9 @@ |
| 18 |
favorites = resume_data.get("favorites") |
| 19 |
if isinstance(favorites, list): |
| 20 |
self._load_favorites(resume_data) |
| 21 |
- mergelist = resume_data.get("mergelist", []) |
| 22 |
+ mergelist = resume_data.get("mergelist") |
| 23 |
+ if not isinstance(mergelist, list): |
| 24 |
+ mergelist = [] |
| 25 |
|
| 26 |
if mergelist and "--skipfirst" in self.myopts: |
| 27 |
for i, task in enumerate(mergelist): |
| 28 |
@@ -7730,6 +7732,7 @@ |
| 29 |
del myopts["--tree"] |
| 30 |
portage.writemsg(colorize("WARN", " * ") + \ |
| 31 |
"--tree is broken with --nodeps. Disabling...\n") |
| 32 |
+ debug = "--debug" in myopts |
| 33 |
verbose = "--verbose" in myopts |
| 34 |
quiet = "--quiet" in myopts |
| 35 |
if pretend or fetchonly: |
| 36 |
@@ -7791,6 +7794,19 @@ |
| 37 |
from output import EOutput |
| 38 |
out = EOutput() |
| 39 |
|
| 40 |
+ resume_data = mtimedb["resume"] |
| 41 |
+ mergelist = resume_data.get("mergelist") |
| 42 |
+ if not isinstance(mergelist, list): |
| 43 |
+ mergelist = [] |
| 44 |
+ if mergelist and debug or (verbose and not quiet): |
| 45 |
+ out.eerror("Invalid resume list:") |
| 46 |
+ out.eerror("") |
| 47 |
+ indent = " " |
| 48 |
+ for task in mergelist: |
| 49 |
+ if isinstance(task, list): |
| 50 |
+ out.eerror(indent + str(tuple(task))) |
| 51 |
+ out.eerror("") |
| 52 |
+ |
| 53 |
if isinstance(e, mydepgraph.UnsatisfiedResumeDep): |
| 54 |
out.eerror("An expected dependency " + \ |
| 55 |
"is not installed: %s" % str(e)) |
| 56 |
|
| 57 |
-- |
| 58 |
gentoo-commits@l.g.o mailing list |
Archives