| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-01 04:40:07 +0000 (Sun, 01 Jun 2008) |
| 3 |
New Revision: 10531 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Update the UnsatisfiedResumeDep display to distinguish masked packages |
| 9 |
from those with unsatisfied dependencies. (trunk r10529) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-06-01 04:38:06 UTC (rev 10530) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-06-01 04:40:07 UTC (rev 10531) |
| 16 |
@@ -8394,15 +8394,22 @@ |
| 17 |
out.eerror("") |
| 18 |
indent = " " |
| 19 |
for dep in e.value: |
| 20 |
- out.eerror(indent + str(dep.atom) + " pulled in by:") |
| 21 |
- out.eerror(2 * indent + str(dep.parent)) |
| 22 |
- out.eerror("") |
| 23 |
+ if dep.atom is None: |
| 24 |
+ out.eerror(indent + "Masked package:") |
| 25 |
+ out.eerror(2 * indent + str(dep.parent)) |
| 26 |
+ out.eerror("") |
| 27 |
+ else: |
| 28 |
+ out.eerror(indent + str(dep.atom) + " pulled in by:") |
| 29 |
+ out.eerror(2 * indent + str(dep.parent)) |
| 30 |
+ out.eerror("") |
| 31 |
msg = "The resume list contains packages " + \ |
| 32 |
- "with dependencies that have not been " + \ |
| 33 |
- "installed yet. Please restart/continue " + \ |
| 34 |
+ "that are either masked or have " + \ |
| 35 |
+ "unsatisfied dependencies. " + \ |
| 36 |
+ "Please restart/continue " + \ |
| 37 |
"the operation manually, or use --skipfirst " + \ |
| 38 |
"to skip the first package in the list and " + \ |
| 39 |
- "any other packages that may have missing dependencies." |
| 40 |
+ "any other packages that may be " + \ |
| 41 |
+ "masked or have missing dependencies." |
| 42 |
for line in wrap(msg, 72): |
| 43 |
out.eerror(line) |
| 44 |
elif isinstance(e, portage_exception.PackageNotFound): |
| 45 |
|
| 46 |
-- |
| 47 |
gentoo-commits@l.g.o mailing list |
Archives