Make the ignorance of local settings complete.

diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py
index 4ceff7c1ed9ec88b0570bd0f3295021b409794a6..9c70bee9174f18263363eb72c6b721cf792c324b 100644 (file)
--- a/pym/gentoolkit/eshowkw/__init__.py
+++ b/pym/gentoolkit/eshowkw/__init__.py
@@ -104,8 +104,8 @@ def main(argv, indirect = False):
                porto.nocolor()
        keywords = keywords_header(prefix, highlight_arch, order)
        if len(package) > 0:
-               settings = portc(local_config=False)
-               dbapi = portdbapi(mysettings=settings)
+               mysettings = portc(local_config=False)
+               dbapi = portdbapi(mysettings=mysettings)
                if not use_overlays:
                        dbapi.porttrees = [dbapi.porttree_root]
                map(lambda x: process_display(x, keywords, dbapi), package)
@@ -120,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)
-               settings = portc(local_config=False, env={'PORTDIR_OVERLAY': overlays})
-               dbapi = portdbapi(mysettings=settings)
+               mysettings = portc(local_config=False, env={'PORTDIR_OVERLAY': overlays})
+               dbapi = portdbapi(mysettings=mysettings)
                # 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 53b1f0d9f56c419365cd8d0fc6d58155e0c342d5..e60e8d5d6bce1a2ff45f6a9c3951c7d4bcaf1379 100644 (file)
--- a/pym/gentoolkit/eshowkw/keywords_content.py
+++ b/pym/gentoolkit/eshowkw/keywords_content.py
@@ -129,7 +129,8 @@ class keywords_content:
                def __getMaskStatus(self, cpv):
                        """Figure out if package is pmasked."""
                        try:
-                               if port.getmaskingstatus(cpv) == ['package.mask']:
+                               mysettings = port.config(local_config=False)
+                               if port.getmaskingstatus(cpv, settings=mysettings) == ['package.mask']:
                                        return True
                        except:
                                # occurs when package is not known by portdb