From 007d3c6b2e04fa35e05539b9d809f5a0b2d91af4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Mar 2008 10:01:18 +0000 Subject: Fix display code that can triger a 'Invalid category' exception when it is given a blocker. It's only supposed to execute for normal packages. (trunk r9630) svn path=/main/branches/2.1.2/; revision=9631 --- bin/emerge | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index cfe84bdb8..1397e2bd7 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3696,24 +3696,24 @@ class depgraph: myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd p.append(myprint) - mysplit = [portage.cpv_getkey(pkg_key)] + \ - list(portage.catpkgsplit(pkg_key)[2:]) - if "--tree" not in self.myopts and mysplit and \ - len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ - x[1] == "/": - - if mysplit[2] == "r0": - myversion = mysplit[1] - else: - myversion = "%s-%s" % (mysplit[1], mysplit[2]) - - if myversion != portage.VERSION and "--quiet" not in self.myopts: - if mylist_index < len(mylist) - 1 and \ - "livecvsportage" not in self.settings.features: - p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) - p.append(colorize("WARN", " then resume the merge.")) - print - del mysplit + mysplit = [portage.cpv_getkey(pkg_key)] + \ + list(portage.catpkgsplit(pkg_key)[2:]) + if "--tree" not in self.myopts and mysplit and \ + len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ + x[1] == "/": + + if mysplit[2] == "r0": + myversion = mysplit[1] + else: + myversion = "%s-%s" % (mysplit[1], mysplit[2]) + + if myversion != portage.VERSION and "--quiet" not in self.myopts: + if mylist_index < len(mylist) - 1 and \ + "livecvsportage" not in self.settings.features: + p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) + p.append(colorize("WARN", " then resume the merge.")) + print + del mysplit for x in p: print x -- cgit v1.2.3-1-g7c22