| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 10:01:18 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9631 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 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 |
(trunk r9630) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-03-30 10:00:50 UTC (rev 9630) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-03-30 10:01:18 UTC (rev 9631) |
| 17 |
@@ -3696,25 +3696,25 @@ |
| 18 |
myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd |
| 19 |
p.append(myprint) |
| 20 |
|
| 21 |
- mysplit = [portage.cpv_getkey(pkg_key)] + \ |
| 22 |
- list(portage.catpkgsplit(pkg_key)[2:]) |
| 23 |
- if "--tree" not in self.myopts and mysplit and \ |
| 24 |
- len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ |
| 25 |
- x[1] == "/": |
| 26 |
+ mysplit = [portage.cpv_getkey(pkg_key)] + \ |
| 27 |
+ list(portage.catpkgsplit(pkg_key)[2:]) |
| 28 |
+ if "--tree" not in self.myopts and mysplit and \ |
| 29 |
+ len(mysplit) == 3 and mysplit[0] == "sys-apps/portage" and \ |
| 30 |
+ x[1] == "/": |
| 31 |
+ |
| 32 |
+ if mysplit[2] == "r0": |
| 33 |
+ myversion = mysplit[1] |
| 34 |
+ else: |
| 35 |
+ myversion = "%s-%s" % (mysplit[1], mysplit[2]) |
| 36 |
+ |
| 37 |
+ if myversion != portage.VERSION and "--quiet" not in self.myopts: |
| 38 |
+ if mylist_index < len(mylist) - 1 and \ |
| 39 |
+ "livecvsportage" not in self.settings.features: |
| 40 |
+ p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) |
| 41 |
+ p.append(colorize("WARN", " then resume the merge.")) |
| 42 |
+ print |
| 43 |
+ del mysplit |
| 44 |
|
| 45 |
- if mysplit[2] == "r0": |
| 46 |
- myversion = mysplit[1] |
| 47 |
- else: |
| 48 |
- myversion = "%s-%s" % (mysplit[1], mysplit[2]) |
| 49 |
- |
| 50 |
- if myversion != portage.VERSION and "--quiet" not in self.myopts: |
| 51 |
- if mylist_index < len(mylist) - 1 and \ |
| 52 |
- "livecvsportage" not in self.settings.features: |
| 53 |
- p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) |
| 54 |
- p.append(colorize("WARN", " then resume the merge.")) |
| 55 |
- print |
| 56 |
- del mysplit |
| 57 |
- |
| 58 |
for x in p: |
| 59 |
print x |
| 60 |
for x in blockers: |
| 61 |
|
| 62 |
-- |
| 63 |
gentoo-commits@l.g.o mailing list |
Archives