| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-04 05:51:51 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10164 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
When a --resume list is rejected due to unsatisfied deps, display a |
| 9 |
list of missing deps and which packages they belong to. |
| 10 |
(trunk r10143) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-04 05:25:58 UTC (rev 10163) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-04 05:51:51 UTC (rev 10164) |
| 17 |
@@ -5071,7 +5071,7 @@ |
| 18 |
# resume list invalid, so convert it to a |
| 19 |
# UnsatisfiedResumeDep exception. |
| 20 |
raise self.UnsatisfiedResumeDep( |
| 21 |
- self._unsatisfied_deps[0].atom) |
| 22 |
+ self._unsatisfied_deps) |
| 23 |
self._serialized_tasks_cache = None |
| 24 |
try: |
| 25 |
self.altlist() |
| 26 |
@@ -7882,9 +7882,14 @@ |
| 27 |
out.eerror("") |
| 28 |
|
| 29 |
if isinstance(e, mydepgraph.UnsatisfiedResumeDep): |
| 30 |
- out.eerror("An expected dependency " + \ |
| 31 |
- "is not installed: %s" % str(e)) |
| 32 |
+ out.eerror("One or more expected dependencies " + \ |
| 33 |
+ "are not installed:") |
| 34 |
out.eerror("") |
| 35 |
+ indent = " " |
| 36 |
+ for dep in e.value: |
| 37 |
+ out.eerror(indent + str(dep.atom) + " pulled in by:") |
| 38 |
+ out.eerror(2 * indent + str(dep.parent)) |
| 39 |
+ out.eerror("") |
| 40 |
msg = "The resume list contains packages " + \ |
| 41 |
"with dependencies that have not been " + \ |
| 42 |
"installed yet. Please restart/continue " + \ |
| 43 |
|
| 44 |
-- |
| 45 |
gentoo-commits@l.g.o mailing list |
Archives