summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-01 04:35:51 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-01 04:35:51 +0000
commitb03f0564fa2afe37c6ce1b02cce4257008adfd07 (patch)
tree2b59700c5d6e2ce2dde5be466f18d86ab910c6a3
parente9dfb3c39141a922404d98d23d4c43b31928c429 (diff)
downloadportage-b03f0564fa2afe37c6ce1b02cce4257008adfd07.tar.gz
portage-b03f0564fa2afe37c6ce1b02cce4257008adfd07.tar.bz2
portage-b03f0564fa2afe37c6ce1b02cce4257008adfd07.zip
Update the UnsatisfiedResumeDep display to distinguish masked packages
from those with unsatisfied dependencies. svn path=/main/trunk/; revision=10529
-rw-r--r--pym/_emerge/__init__.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ee284170a..e73d3d6d0 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8448,15 +8448,22 @@ def action_build(settings, trees, mtimedb,
out.eerror("")
indent = " "
for dep in e.value:
- out.eerror(indent + str(dep.atom) + " pulled in by:")
- out.eerror(2 * indent + str(dep.parent))
- out.eerror("")
+ if dep.atom is None:
+ out.eerror(indent + "Masked package:")
+ out.eerror(2 * indent + str(dep.parent))
+ out.eerror("")
+ else:
+ out.eerror(indent + str(dep.atom) + " pulled in by:")
+ out.eerror(2 * indent + str(dep.parent))
+ out.eerror("")
msg = "The resume list contains packages " + \
- "with dependencies that have not been " + \
- "installed yet. Please restart/continue " + \
+ "that are either masked or have " + \
+ "unsatisfied dependencies. " + \
+ "Please restart/continue " + \
"the operation manually, or use --skipfirst " + \
"to skip the first package in the list and " + \
- "any other packages that may have missing dependencies."
+ "any other packages that may be " + \
+ "masked or have missing dependencies."
for line in wrap(msg, 72):
out.eerror(line)
elif isinstance(e, portage.exception.PackageNotFound):