diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-23 19:42:57 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-23 19:42:57 +0100 |
| commit | 4cf69e92463ae1c328ff89832b77192d8c9f5119 (patch) | |
| tree | 6fba95e28db57c9e0a399bcd464e83138899cb17 | |
| parent | f69fa9dd209f499e1a822e99cd950ac65ceb5f42 (diff) | |
| download | gentoolkit-4cf69e92463ae1c328ff89832b77192d8c9f5119.tar.gz | |
Ignore local_settings for package maks.
| -rw-r--r-- | pym/gentoolkit/eshowkw/__init__.py | 7 | ||||
| -rw-r--r-- | pym/gentoolkit/eshowkw/keywords_content.py | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py index d5087a4..4ceff7c 100644 --- 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 94df37d..53b1f0d 100644 --- 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 |