summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-30 10:00:50 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-30 10:00:50 +0000
commitcc27750260a450d1f8866fbe376247f5d9435466 (patch)
tree0c22fc9e24aa30081f282fbcab4417cddb5654ae
parenta096da4db6b7e768900a39e60d74ad43f74f0c42 (diff)
downloadportage-cc27750260a450d1f8866fbe376247f5d9435466.tar.gz
portage-cc27750260a450d1f8866fbe376247f5d9435466.tar.bz2
portage-cc27750260a450d1f8866fbe376247f5d9435466.zip
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
-rw-r--r--pym/_emerge/__init__.py34
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