1 |
Author: zmedico |
2 |
Date: 2008-03-30 10:00:50 +0000 (Sun, 30 Mar 2008) |
3 |
New Revision: 9630 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Fix display code that can triger a 'Invalid category' exception when it |
9 |
is given a blocker. It's only supposed to execute for normal packages. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2008-03-30 09:18:34 UTC (rev 9629) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-03-30 10:00:50 UTC (rev 9630) |
16 |
@@ -4008,24 +4008,24 @@ |
17 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd |
18 |
p.append(myprint) |
19 |
|
20 |
- mysplit = [portage.cpv_getkey(pkg_key)] + \ |
21 |
- list(portage.catpkgsplit(pkg_key)[2:]) |
22 |
- if "--tree" not in self.myopts and mysplit and \ |
23 |
- len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ |
24 |
- x[1] == "/": |
25 |
+ mysplit = [portage.cpv_getkey(pkg_key)] + \ |
26 |
+ list(portage.catpkgsplit(pkg_key)[2:]) |
27 |
+ if "--tree" not in self.myopts and mysplit and \ |
28 |
+ len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ |
29 |
+ x[1] == "/": |
30 |
+ |
31 |
+ if mysplit[2] == "r0": |
32 |
+ myversion = mysplit[1] |
33 |
+ else: |
34 |
+ myversion = "%s-%s" % (mysplit[1], mysplit[2]) |
35 |
+ |
36 |
+ if myversion != portage.VERSION and "--quiet" not in self.myopts: |
37 |
+ if mylist_index < len(mylist) - 1: |
38 |
+ p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) |
39 |
+ p.append(colorize("WARN", " then resume the merge.")) |
40 |
+ print |
41 |
+ del mysplit |
42 |
|
43 |
- if mysplit[2] == "r0": |
44 |
- myversion = mysplit[1] |
45 |
- else: |
46 |
- myversion = "%s-%s" % (mysplit[1], mysplit[2]) |
47 |
- |
48 |
- if myversion != portage.VERSION and "--quiet" not in self.myopts: |
49 |
- if mylist_index < len(mylist) - 1: |
50 |
- p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) |
51 |
- p.append(colorize("WARN", " then resume the merge.")) |
52 |
- print |
53 |
- del mysplit |
54 |
- |
55 |
for x in p: |
56 |
print x |
57 |
for x in blockers: |
58 |
|
59 |
-- |
60 |
gentoo-commits@l.g.o mailing list |