Allow portage.getmaskingreason() to operate without global variables.

svn path=/main/trunk/; revision=3727

2 files changed, 7 insertions, 3 deletions

diff --git a/bin/emerge b/bin/emerge
index 32a72527c..98ded201b 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1058,7 +1058,8 @@ class depgraph:
 								mreasons = portage.getmaskingstatus(p,
 									settings=self.settings, portdb=self.portdb)
 								print "- "+p+" (masked by: "+string.join(mreasons, ", ")+")"
-								comment = portage.getmaskingreason(p)
+								comment = portage.getmaskingreason(p,
+									settings=self.settings, portdb=self.portdb)
 								if comment and comment != oldcomment:
 									print comment
 									oldcomment = comment
diff --git a/pym/portage.py b/pym/portage.py
index c4d0e4a50..839117a65 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3633,9 +3633,12 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None):
 	else:
 		return mykey
 
-def getmaskingreason(mycpv):
+def getmaskingreason(mycpv, settings=None, portdb=None):
 	from portage_util import grablines
-	global portdb, settings
+	if settings is None:
+		settings = globals()["settings"]
+	if portdb is None:
+		portdb = globals()["portdb"]
 	mysplit = catpkgsplit(mycpv)
 	if not mysplit:
 		raise ValueError("invalid CPV: %s" % mycpv)