diff options
| -rwxr-xr-x | bin/emerge | 3 | ||||
| -rw-r--r-- | pym/portage.py | 7 |
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) |