diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-20 11:58:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-20 11:58:49 +0000 |
| commit | 54a080bb646d640c3f53797ebb99235b98b41ad3 (patch) | |
| tree | 87c11d590fed753248c3130ee9d24dc53737371d /pym | |
| parent | db458e6f62d7d4c66562b824900c262e3015948d (diff) | |
| download | portage-54a080bb646d640c3f53797ebb99235b98b41ad3.tar.gz portage-54a080bb646d640c3f53797ebb99235b98b41ad3.tar.bz2 portage-54a080bb646d640c3f53797ebb99235b98b41ad3.zip | |
Merge the unified package masking output from trunk for bug #149816.
svn path=/main/branches/2.1.2/; revision=8986
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/portage.py b/pym/portage.py index bf6016579..6bb041d4a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5558,7 +5558,7 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None): else: return mykey -def getmaskingreason(mycpv, settings=None, portdb=None, return_location=False): +def getmaskingreason(mycpv, metadata=None, settings=None, portdb=None, return_location=False): from portage_util import grablines if settings is None: settings = globals()["settings"] @@ -5567,7 +5567,6 @@ def getmaskingreason(mycpv, settings=None, portdb=None, return_location=False): mysplit = catpkgsplit(mycpv) if not mysplit: raise ValueError("invalid CPV: %s" % mycpv) - metadata = None if metadata is None: db_keys = list(portdb._aux_cache_keys) try: @@ -5626,7 +5625,7 @@ def getmaskingreason(mycpv, settings=None, portdb=None, return_location=False): else: return None -def getmaskingstatus(mycpv, settings=None, portdb=None): +def getmaskingstatus(mycpv, metadata=None, settings=None, portdb=None): if settings is None: settings = config(clone=globals()["settings"]) if portdb is None: @@ -5634,7 +5633,6 @@ def getmaskingstatus(mycpv, settings=None, portdb=None): mysplit = catpkgsplit(mycpv) if not mysplit: raise ValueError("invalid CPV: %s" % mycpv) - metadata = None if metadata is None: db_keys = list(portdb._aux_cache_keys) try: |