1 |
Author: zmedico |
2 |
Date: 2008-03-30 07:14:24 +0000 (Sun, 30 Mar 2008) |
3 |
New Revision: 9625 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Bug #211365 - Use catpkgsplit() instead of pkgsplit() for a cpv. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-03-30 06:57:33 UTC (rev 9624) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-03-30 07:14:24 UTC (rev 9625) |
15 |
@@ -631,7 +631,7 @@ |
16 |
self.portdb.xmatch("match-all",match)) |
17 |
elif mtype == "desc": |
18 |
full_package = match |
19 |
- match = portage.pkgsplit(match)[0] |
20 |
+ match = portage.cpv_getkey(match) |
21 |
elif mtype == "set": |
22 |
print green("*")+" "+white(match) |
23 |
print " ", darkgreen("Description:")+" ", self.sdict[match].getMetadata("DESCRIPTION") |
24 |
@@ -4008,7 +4008,8 @@ |
25 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd |
26 |
p.append(myprint) |
27 |
|
28 |
- mysplit = portage.pkgsplit(x[2]) |
29 |
+ mysplit = [portage.cpv_getkey(pkg_key)] + \ |
30 |
+ list(portage.catpkgsplit(pkg_key)[2:]) |
31 |
if "--tree" not in self.myopts and mysplit and \ |
32 |
len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ |
33 |
x[1] == "/": |
34 |
@@ -4795,8 +4796,8 @@ |
35 |
"--fetch-all-uri" not in self.myopts: |
36 |
|
37 |
# Figure out if we need a restart. |
38 |
- mysplit=portage.pkgsplit(x[2]) |
39 |
- if mysplit[0] == "sys-apps/portage" and x[1] == "/": |
40 |
+ if myroot == "/" and \ |
41 |
+ portage.dep_getkey(pkg_key) == "sys-apps/portage": |
42 |
if len(mymergelist) > mergecount: |
43 |
emergelog(xterm_titles, |
44 |
" ::: completed emerge ("+ \ |
45 |
|
46 |
-- |
47 |
gentoo-commits@l.g.o mailing list |