summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-01 04:43:47 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-01 04:43:47 +0000
commit75e1148c91c8b54ff4b8b011ff81a328a609b9f1 (patch)
treef212f75f18297d2f65b8e93af9e03d9563afcad1
parent0365f60dad7b072d6497820f4fd8544d5af14691 (diff)
downloadportage-75e1148c91c8b54ff4b8b011ff81a328a609b9f1.tar.gz
portage-75e1148c91c8b54ff4b8b011ff81a328a609b9f1.tar.bz2
portage-75e1148c91c8b54ff4b8b011ff81a328a609b9f1.zip
Allow portage.getmaskingstatus() to operate without global variables.
svn path=/main/trunk/; revision=3726
-rwxr-xr-xbin/emerge3
-rw-r--r--pym/portage.py7
2 files changed, 7 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index 4e1c37bea..32a72527c 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1055,7 +1055,8 @@ class depgraph:
print "!!! One of the following masked packages is required to complete your request:"
oldcomment = ""
for p in alleb:
- mreasons = portage.getmaskingstatus(p)
+ mreasons = portage.getmaskingstatus(p,
+ settings=self.settings, portdb=self.portdb)
print "- "+p+" (masked by: "+string.join(mreasons, ", ")+")"
comment = portage.getmaskingreason(p)
if comment and comment != oldcomment:
diff --git a/pym/portage.py b/pym/portage.py
index 13c89ddf5..c4d0e4a50 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3676,8 +3676,11 @@ def getmaskingreason(mycpv):
i = i + 1
return None
-def getmaskingstatus(mycpv):
- global portdb, settings
+def getmaskingstatus(mycpv, settings=None, portdb=None):
+ 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)