| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 12:36:04 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9566 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
display versions of other slots for new-slot installs (bug #213790) |
| 9 |
(trunk r9488) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-03-28 12:31:37 UTC (rev 9565) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-03-28 12:36:04 UTC (rev 9566) |
| 16 |
@@ -3395,7 +3395,8 @@ |
| 17 |
|
| 18 |
#we need to use "--emptrytree" testing here rather than "empty" param testing because "empty" |
| 19 |
#param is used for -u, where you still *do* want to see when something is being upgraded. |
| 20 |
- myoldbest="" |
| 21 |
+ myoldbest = "" |
| 22 |
+ myinslotlist = None |
| 23 |
installed_versions = vardb.match(portage.cpv_getkey(pkg_key)) |
| 24 |
if vardb.cpv_exists(pkg_key): |
| 25 |
addl=" "+yellow("R")+fetch+" " |
| 26 |
@@ -3417,21 +3418,22 @@ |
| 27 |
portage.cpv_getkey(pkg_key): |
| 28 |
myinslotlist = None |
| 29 |
if myinslotlist: |
| 30 |
- myoldbest=portage.best(myinslotlist) |
| 31 |
- addl=" "+fetch |
| 32 |
+ myoldbest = portage.best(myinslotlist) |
| 33 |
+ addl = " " + fetch |
| 34 |
if portage.pkgcmp(portage.pkgsplit(x[2]), portage.pkgsplit(myoldbest)) < 0: |
| 35 |
# Downgrade in slot |
| 36 |
- addl+=turquoise("U")+blue("D") |
| 37 |
+ addl += turquoise("U")+blue("D") |
| 38 |
if ordered: |
| 39 |
counters.downgrades += 1 |
| 40 |
else: |
| 41 |
# Update in slot |
| 42 |
- addl+=turquoise("U")+" " |
| 43 |
+ addl += turquoise("U") + " " |
| 44 |
if ordered: |
| 45 |
counters.upgrades += 1 |
| 46 |
else: |
| 47 |
# New slot, mark it new. |
| 48 |
- addl=" "+green("NS")+fetch+" " |
| 49 |
+ addl = " " + green("NS") + fetch + " " |
| 50 |
+ myoldbest = vardb.match(portage.cpv_getkey(pkg_key)) |
| 51 |
if ordered: |
| 52 |
counters.newslot += 1 |
| 53 |
|
| 54 |
@@ -3444,11 +3446,11 @@ |
| 55 |
portdb.findname(pkg_key), |
| 56 |
inst_matches[0], pkg_key)) |
| 57 |
else: |
| 58 |
- addl=" "+green("N")+" "+fetch+" " |
| 59 |
+ addl = " " + green("N") + " " + fetch + " " |
| 60 |
if ordered: |
| 61 |
counters.new += 1 |
| 62 |
|
| 63 |
- verboseadd="" |
| 64 |
+ verboseadd = "" |
| 65 |
|
| 66 |
if True: |
| 67 |
# USE flag display |
| 68 |
@@ -3465,7 +3467,7 @@ |
| 69 |
cur_use = pkg_use |
| 70 |
cur_use = [flag for flag in cur_use if flag in cur_iuse] |
| 71 |
|
| 72 |
- if myoldbest: |
| 73 |
+ if myoldbest and myinslotlist: |
| 74 |
pkg = myoldbest |
| 75 |
else: |
| 76 |
pkg = x[2] |
| 77 |
@@ -3612,11 +3614,11 @@ |
| 78 |
show_repos = True |
| 79 |
verboseadd += teal("[%s]" % repoadd) |
| 80 |
|
| 81 |
- xs=portage.pkgsplit(x[2]) |
| 82 |
- if xs[2]=="r0": |
| 83 |
- xs[2]="" |
| 84 |
+ xs = list(portage.pkgsplit(x[2])) |
| 85 |
+ if xs[2] == "r0": |
| 86 |
+ xs[2] = "" |
| 87 |
else: |
| 88 |
- xs[2]="-"+xs[2] |
| 89 |
+ xs[2] = "-" + xs[2] |
| 90 |
|
| 91 |
mywidth = 130 |
| 92 |
if "COLUMNWIDTH" in self.settings: |
| 93 |
@@ -3628,16 +3630,22 @@ |
| 94 |
"!!! Unable to parse COLUMNWIDTH='%s'\n" % \ |
| 95 |
self.settings["COLUMNWIDTH"], noiselevel=-1) |
| 96 |
del e |
| 97 |
- oldlp=mywidth-30 |
| 98 |
- newlp=oldlp-30 |
| 99 |
+ oldlp = mywidth - 30 |
| 100 |
+ newlp = oldlp - 30 |
| 101 |
|
| 102 |
indent = " " * depth |
| 103 |
|
| 104 |
if myoldbest: |
| 105 |
- myoldbest=portage.pkgsplit(myoldbest)[1]+"-"+portage.pkgsplit(myoldbest)[2] |
| 106 |
- if myoldbest[-3:]=="-r0": |
| 107 |
- myoldbest=myoldbest[:-3] |
| 108 |
- myoldbest=blue("["+myoldbest+"]") |
| 109 |
+ if myinslotlist: |
| 110 |
+ myoldbest = [myoldbest] |
| 111 |
+ for key in myoldbest: |
| 112 |
+ pos = myoldbest.index(key) |
| 113 |
+ key = portage.pkgsplit(key)[1] + "-" + portage.pkgsplit(key)[2] |
| 114 |
+ if key[-3:] == "-r0": |
| 115 |
+ key = key[:-3] |
| 116 |
+ myoldbest[pos] = key |
| 117 |
+ myoldbest = blue("["+", ".join(myoldbest)+"]") |
| 118 |
+ |
| 119 |
|
| 120 |
pkg_cp = xs[0] |
| 121 |
root_config = self.roots[myroot] |
| 122 |
|
| 123 |
-- |
| 124 |
gentoo-commits@l.g.o mailing list |
Archives