| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 04:26:32 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9617 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
* Make code a bit less prone to potentially hidden TypeError like bugs. |
| 9 |
* Bug #211365 - Use catpkgsplit() instead of pkgsplit() for a cpv. |
| 10 |
(trunk r9614:9616) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 04:16:54 UTC (rev 9616) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 04:26:32 UTC (rev 9617) |
| 17 |
@@ -3347,7 +3347,7 @@ |
| 18 |
|
| 19 |
#we need to use "--emptrytree" testing here rather than "empty" param testing because "empty" |
| 20 |
#param is used for -u, where you still *do* want to see when something is being upgraded. |
| 21 |
- myoldbest = "" |
| 22 |
+ myoldbest = [] |
| 23 |
myinslotlist = None |
| 24 |
installed_versions = vardb.match(portage.cpv_getkey(pkg_key)) |
| 25 |
if vardb.cpv_exists(pkg_key): |
| 26 |
@@ -3370,9 +3370,10 @@ |
| 27 |
portage.cpv_getkey(pkg_key): |
| 28 |
myinslotlist = None |
| 29 |
if myinslotlist: |
| 30 |
- myoldbest = portage.best(myinslotlist) |
| 31 |
+ myoldbest = myinslotlist[:] |
| 32 |
addl = " " + fetch |
| 33 |
- if portage.pkgcmp(portage.pkgsplit(x[2]), portage.pkgsplit(myoldbest)) < 0: |
| 34 |
+ if not portage_dep.cpvequal(pkg_key, |
| 35 |
+ portage.best([pkg_key] + myoldbest)): |
| 36 |
# Downgrade in slot |
| 37 |
addl += turquoise("U")+blue("D") |
| 38 |
if ordered: |
| 39 |
@@ -3420,7 +3421,7 @@ |
| 40 |
cur_use = [flag for flag in cur_use if flag in cur_iuse] |
| 41 |
|
| 42 |
if myoldbest and myinslotlist: |
| 43 |
- pkg = myoldbest |
| 44 |
+ pkg = myoldbest[0] |
| 45 |
else: |
| 46 |
pkg = x[2] |
| 47 |
if self.trees[x[1]]["vartree"].dbapi.cpv_exists(pkg): |
| 48 |
@@ -3587,16 +3588,17 @@ |
| 49 |
|
| 50 |
indent = " " * depth |
| 51 |
|
| 52 |
- if myoldbest: |
| 53 |
- if myinslotlist: |
| 54 |
- myoldbest = [myoldbest] |
| 55 |
+ # Convert myoldbest from a list to a string. |
| 56 |
+ if not myoldbest: |
| 57 |
+ myoldbest = "" |
| 58 |
+ else: |
| 59 |
for pos, key in enumerate(myoldbest): |
| 60 |
- key = portage.pkgsplit(key)[1] + "-" + portage.pkgsplit(key)[2] |
| 61 |
+ key = portage.catpkgsplit(key)[2] + \ |
| 62 |
+ "-" + portage.catpkgsplit(key)[3] |
| 63 |
if key[-3:] == "-r0": |
| 64 |
key = key[:-3] |
| 65 |
myoldbest[pos] = key |
| 66 |
myoldbest = blue("["+", ".join(myoldbest)+"]") |
| 67 |
- |
| 68 |
|
| 69 |
pkg_cp = xs[0] |
| 70 |
root_config = self.roots[myroot] |
| 71 |
|
| 72 |
-- |
| 73 |
gentoo-commits@l.g.o mailing list |
Archives