diff options
| author | Marius Mauch <genone@gentoo.org> | 2006-10-26 15:43:40 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2006-10-26 15:43:40 +0000 |
| commit | 8bdb33b9037f748380041aa8382dd4981921ddf2 (patch) | |
| tree | 9b5ee985772dd3f4d2ff540e544ffb5d36583667 | |
| parent | d110e776d3c178444130b1361a50b00eac7c0275 (diff) | |
| download | portage-8bdb33b9037f748380041aa8382dd4981921ddf2.tar.gz portage-8bdb33b9037f748380041aa8382dd4981921ddf2.tar.bz2 portage-8bdb33b9037f748380041aa8382dd4981921ddf2.zip | |
rename getmaskingreason() to getpmaskcomment() to clarify its function, report each license as a separate mask instead of combining them all together into a single value for getmaskingstatus()
svn path=/main/trunk/; revision=4823
| -rwxr-xr-x | bin/emerge | 11 | ||||
| -rw-r--r-- | pym/portage.py | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index e98ea6211..440a6cb87 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1362,11 +1362,12 @@ class depgraph: mreasons = portage.getmaskingstatus(p, settings=pkgsettings, portdb=portdb) print "- "+p+" (masked by: "+string.join(mreasons, ", ")+")" - comment = portage.getmaskingreason(p, - settings=pkgsettings, portdb=portdb) - if comment and comment != oldcomment: - print comment - oldcomment = comment + if "package.mask" in mreasons: + comment = portage.getpmaskcomment(p, + settings=pkgsettings, portdb=portdb) + if comment and comment != oldcomment: + print comment + oldcomment = comment print print "For more information, see MASKED PACKAGES section in the emerge man page or " print "refer to the Gentoo Handbook." diff --git a/pym/portage.py b/pym/portage.py index 958363042..165b05041 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3832,7 +3832,7 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None): else: return mykey -def getmaskingreason(mycpv, settings=None, portdb=None): +def getpmaskcomment(mycpv, settings=None, portdb=None): from portage_util import grablines if settings is None: settings = globals()["settings"] @@ -3877,6 +3877,8 @@ def getmaskingreason(mycpv, settings=None, portdb=None): return comment i = i + 1 return None +# Compability name +getmaskingreason=getpmaskcomment def getmaskingstatus(mycpv, settings=None, portdb=None): if settings is None: @@ -3965,7 +3967,7 @@ def getmaskingstatus(mycpv, settings=None, portdb=None): license_req = dep_check(mylicense, None, settings, str_matches=str_matches)[1] if license_req: - rValue.append(" ".join(license_req) + " license(s)") + rValue += [x+" license" for x in license_req] return rValue |