When warning about package categories that haven't been configured via

/etc/portage/categories, join the path with PORTAGE_CONFIGROOT. Thanks
to Ned Ludd <solar@g.o> for reporting.

svn path=/main/trunk/; revision=11677

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index d156ef76782cc60f92a83f335395113dd585e824..7918e3ee3240098710f855fd12dfc4f5fcce8bfb 100644 (file)
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -548,7 +548,8 @@ class binarytree(object):
                                                        "unrecognized category: '%s'\n") % full_path,
                                                        noiselevel=-1)
                                                writemsg(("!!! '%s' has a category that is not" + \
-                                                       " listed in /etc/portage/categories\n") % mycpv,
+                                                       " listed in %setc/portage/categories\n") % \
+                                                       (mycpv, self.settings["PORTAGE_CONFIGROOT"]),
                                                        noiselevel=-1)
                                                continue
                                        pkg_paths[mycpv] = mypath
@@ -713,7 +714,8 @@ class binarytree(object):
                                                "unrecognized category: '%s'\n") % fullpkg,
                                                noiselevel=-1)
                                        writemsg(("!!! '%s' has a category that is not" + \
-                                               " listed in /etc/portage/categories\n") % fullpkg,
+                                               " listed in %setc/portage/categories\n") % \
+                                               (fullpkg, self.settings["PORTAGE_CONFIGROOT"]),
                                                noiselevel=-1)
                                        continue
                                mykey = dep_getkey(fullpkg)

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 41ca19c856732e9ebd7975a69c84c5c722fd8cb4..c6268a8ec022bd39091fd76aa4c6e0da10f17c53 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -728,7 +728,8 @@ class portdbapi(dbapi):
                                        d[mysplit[0]+"/"+pf] = None
                if invalid_category and d:
                        writemsg(("\n!!! '%s' has a category that is not listed in " + \
-                               "/etc/portage/categories\n") % mycp, noiselevel=-1)
+                               "%setc/portage/categories\n") % \
+                               (mycp, self.mysettings["PORTAGE_CONFIGROOT"]), noiselevel=-1)
                        mylist = []
                else:
                        mylist = d.keys()