| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 07:20:59 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9626 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Bug #211365 - Use catpkgsplit() instead of pkgsplit() for a cpv. |
| 9 |
(trunk r9625) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 07:14:24 UTC (rev 9625) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 07:20:59 UTC (rev 9626) |
| 16 |
@@ -608,7 +608,7 @@ |
| 17 |
self.portdb.xmatch("match-all",match)) |
| 18 |
else: |
| 19 |
full_package = match |
| 20 |
- match = portage.pkgsplit(match)[0] |
| 21 |
+ match = portage.cpv_getkey(match) |
| 22 |
|
| 23 |
if full_package: |
| 24 |
try: |
| 25 |
@@ -3696,7 +3696,8 @@ |
| 26 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd |
| 27 |
p.append(myprint) |
| 28 |
|
| 29 |
- mysplit = portage.pkgsplit(x[2]) |
| 30 |
+ mysplit = [portage.cpv_getkey(pkg_key)] + \ |
| 31 |
+ list(portage.catpkgsplit(pkg_key)[2:]) |
| 32 |
if "--tree" not in self.myopts and mysplit and \ |
| 33 |
len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ |
| 34 |
x[1] == "/": |
| 35 |
@@ -4453,8 +4454,8 @@ |
| 36 |
"--fetch-all-uri" not in self.myopts: |
| 37 |
|
| 38 |
# Figure out if we need a restart. |
| 39 |
- mysplit=portage.pkgsplit(x[2]) |
| 40 |
- if mysplit[0] == "sys-apps/portage" and x[1] == "/": |
| 41 |
+ if myroot == "/" and \ |
| 42 |
+ portage.dep_getkey(pkg_key) == "sys-apps/portage": |
| 43 |
if "livecvsportage" not in self.settings.features: |
| 44 |
if len(mymergelist) > mergecount: |
| 45 |
emergelog(xterm_titles, |
| 46 |
|
| 47 |
-- |
| 48 |
gentoo-commits@l.g.o mailing list |
Archives