Ignore local_settings for package maks.

diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py
index d5087a494051bb49b54b8f323c65a15a68599547..4ceff7c1ed9ec88b0570bd0f3295021b409794a6 100644 (file)
--- a/pym/gentoolkit/eshowkw/__init__.py
+++ b/pym/gentoolkit/eshowkw/__init__.py
@@ -104,7 +104,8 @@ def main(argv, indirect = False):
                porto.nocolor()
        keywords = keywords_header(prefix, highlight_arch, order)
        if len(package) > 0:
-               dbapi = portdb[ports['ROOT']]['porttree'].dbapi
+               settings = portc(local_config=False)
+               dbapi = portdbapi(mysettings=settings)
                if not use_overlays:
                        dbapi.porttrees = [dbapi.porttree_root]
                map(lambda x: process_display(x, keywords, dbapi), package)
@@ -119,8 +120,8 @@ def main(argv, indirect = False):
                package= '%s/%s' % (os.path.basename(os.path.abspath('../')), os.path.basename(currdir))
                ourtree = os.path.abspath('../../')
                overlays = '%s %s' % (ports['PORTDIR_OVERLAY'], ourtree)
-               mysettings = portc(env={'PORTDIR_OVERLAY': overlays})
-               dbapi = portdbapi(mysettings=mysettings)
+               settings = portc(local_config=False, env={'PORTDIR_OVERLAY': overlays})
+               dbapi = portdbapi(mysettings=settings)
                # specify that we want just our nice tree we are in cwd
                dbapi.porttrees = [ourtree]
                process_display(package, keywords, dbapi)

diff --git a/pym/gentoolkit/eshowkw/keywords_content.py b/pym/gentoolkit/eshowkw/keywords_content.py
index 94df37d0435c54d4be5702dd220550f2f710c08a..53b1f0d9f56c419365cd8d0fc6d58155e0c342d5 100644 (file)
--- a/pym/gentoolkit/eshowkw/keywords_content.py
+++ b/pym/gentoolkit/eshowkw/keywords_content.py
@@ -127,10 +127,7 @@ class keywords_content:
                        return pv
 
                def __getMaskStatus(self, cpv):
-                       """
-                       Figure out if package is pmasked.
-                       This also uses user settings in /etc/ so local changes are important.
-                       """
+                       """Figure out if package is pmasked."""
                        try:
                                if port.getmaskingstatus(cpv) == ['package.mask']:
                                        return True