From 323f1a0758dd36ed7639611650b8302b44f724c4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 11 Oct 2008 19:34:10 +0000 Subject: [PATCH] When warning about package categories that haven't been configured via /etc/portage/categories, join the path with PORTAGE_CONFIGROOT. Thanks to Ned Ludd for reporting. svn path=/main/trunk/; revision=11677 --- pym/portage/dbapi/bintree.py | 6 ++++-- pym/portage/dbapi/porttree.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index d156ef767..7918e3ee3 100644 --- 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 41ca19c85..c6268a8ec 100644 --- 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() -- 2.26.2