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.

svn path=/main/trunk/; revision=9630

1 files changed, 17 insertions, 17 deletions

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 56f187548..c22041abf 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4008,23 +4008,23 @@ class depgraph(object):
 							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:
-						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:
+							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