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

diff --git a/bin/emerge b/bin/emerge
index cfe84bdb86dd3c19decd86bcc56979980a754f3c..1397e2bd7d3d78dabe5967ec29717b8ce6d680dd 100755 (executable)
--- 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