From b03f0564fa2afe37c6ce1b02cce4257008adfd07 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 1 Jun 2008 04:35:51 +0000 Subject: Update the UnsatisfiedResumeDep display to distinguish masked packages from those with unsatisfied dependencies. svn path=/main/trunk/; revision=10529 --- pym/_emerge/__init__.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'pym/_emerge') 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): -- cgit v1.2.3-1-g7c22