summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-30 07:14:24 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-30 07:14:24 +0000
commitb478f07cfe7564290f33df1ec20dd6c77707c17d (patch)
tree6ef8791b461e100e0465c00f6c43e58bf774d167
parentf3204769c6686890b7b7295a7dd91c97ecb73f39 (diff)
downloadportage-b478f07cfe7564290f33df1ec20dd6c77707c17d.tar.gz
portage-b478f07cfe7564290f33df1ec20dd6c77707c17d.tar.bz2
portage-b478f07cfe7564290f33df1ec20dd6c77707c17d.zip
Bug #211365 - Use catpkgsplit() instead of pkgsplit() for a cpv.
svn path=/main/trunk/; revision=9625
-rw-r--r--pym/_emerge/__init__.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index f87b7c3da..56f187548 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -631,7 +631,7 @@ class search(object):
self.portdb.xmatch("match-all",match))
elif mtype == "desc":
full_package = match
- match = portage.pkgsplit(match)[0]
+ match = portage.cpv_getkey(match)
elif mtype == "set":
print green("*")+" "+white(match)
print " ", darkgreen("Description:")+" ", self.sdict[match].getMetadata("DESCRIPTION")
@@ -4008,7 +4008,8 @@ class depgraph(object):
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd
p.append(myprint)
- mysplit = portage.pkgsplit(x[2])
+ 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] == "/":
@@ -4795,8 +4796,8 @@ class MergeTask(object):
"--fetch-all-uri" not in self.myopts:
# Figure out if we need a restart.
- mysplit=portage.pkgsplit(x[2])
- if mysplit[0] == "sys-apps/portage" and x[1] == "/":
+ if myroot == "/" and \
+ portage.dep_getkey(pkg_key) == "sys-apps/portage":
if len(mymergelist) > mergecount:
emergelog(xterm_titles,
" ::: completed emerge ("+ \