From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 23 Jan 2011 18:51:06 +0000 (+0100)
Subject: Make the ignorance of local settings complete.
X-Git-Tag: gentoolkit-0.3.0~26
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=270e4504bd8c2fe0b3a416ea884860998d5bb8b9;p=gentoolkit.git

Make the ignorance of local settings complete.
---

diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py
index 4ceff7c..9c70bee 100644
--- 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 53b1f0d..e60e8d5 100644
--- 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