| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-11 19:34:10 +0000 (Sat, 11 Oct 2008) |
| 3 |
New Revision: 11677 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/bintree.py |
| 7 |
main/trunk/pym/portage/dbapi/porttree.py |
| 8 |
Log: |
| 9 |
When warning about package categories that haven't been configured via |
| 10 |
/etc/portage/categories, join the path with PORTAGE_CONFIGROOT. Thanks |
| 11 |
to Ned Ludd <solar@g.o> for reporting. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/portage/dbapi/bintree.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/portage/dbapi/bintree.py 2008-10-11 18:51:07 UTC (rev 11676) |
| 17 |
+++ main/trunk/pym/portage/dbapi/bintree.py 2008-10-11 19:34:10 UTC (rev 11677) |
| 18 |
@@ -548,7 +548,8 @@ |
| 19 |
"unrecognized category: '%s'\n") % full_path, |
| 20 |
noiselevel=-1) |
| 21 |
writemsg(("!!! '%s' has a category that is not" + \ |
| 22 |
- " listed in /etc/portage/categories\n") % mycpv, |
| 23 |
+ " listed in %setc/portage/categories\n") % \ |
| 24 |
+ (mycpv, self.settings["PORTAGE_CONFIGROOT"]), |
| 25 |
noiselevel=-1) |
| 26 |
continue |
| 27 |
pkg_paths[mycpv] = mypath |
| 28 |
@@ -713,7 +714,8 @@ |
| 29 |
"unrecognized category: '%s'\n") % fullpkg, |
| 30 |
noiselevel=-1) |
| 31 |
writemsg(("!!! '%s' has a category that is not" + \ |
| 32 |
- " listed in /etc/portage/categories\n") % fullpkg, |
| 33 |
+ " listed in %setc/portage/categories\n") % \ |
| 34 |
+ (fullpkg, self.settings["PORTAGE_CONFIGROOT"]), |
| 35 |
noiselevel=-1) |
| 36 |
continue |
| 37 |
mykey = dep_getkey(fullpkg) |
| 38 |
|
| 39 |
Modified: main/trunk/pym/portage/dbapi/porttree.py |
| 40 |
=================================================================== |
| 41 |
--- main/trunk/pym/portage/dbapi/porttree.py 2008-10-11 18:51:07 UTC (rev 11676) |
| 42 |
+++ main/trunk/pym/portage/dbapi/porttree.py 2008-10-11 19:34:10 UTC (rev 11677) |
| 43 |
@@ -728,7 +728,8 @@ |
| 44 |
d[mysplit[0]+"/"+pf] = None |
| 45 |
if invalid_category and d: |
| 46 |
writemsg(("\n!!! '%s' has a category that is not listed in " + \ |
| 47 |
- "/etc/portage/categories\n") % mycp, noiselevel=-1) |
| 48 |
+ "%setc/portage/categories\n") % \ |
| 49 |
+ (mycp, self.mysettings["PORTAGE_CONFIGROOT"]), noiselevel=-1) |
| 50 |
mylist = [] |
| 51 |
else: |
| 52 |
mylist = d.keys() |
Archives