From b2a4e7b88356eb28ea942b1dcd3a1903c9a2439f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 1 Jun 2008 04:40:07 +0000 Subject: Update the UnsatisfiedResumeDep display to distinguish masked packages from those with unsatisfied dependencies. (trunk r10529) svn path=/main/branches/2.1.2/; revision=10531 --- bin/emerge | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 29832cf4a..e78d3b9a7 100755 --- a/bin/emerge +++ b/bin/emerge @@ -8394,15 +8394,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