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