diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-11-15 23:40:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-15 23:40:00 +0000 |
| commit | daca3458b14261506b5351d1a55e55bc43cbfebb (patch) | |
| tree | d7a7775eb9eb3300963061d5172f1190ddf47050 /pym/_emerge/visible.py | |
| parent | 38e7087a2bc99f4f429ca6968f4678cd2123ebdf (diff) | |
| download | portage-daca3458b14261506b5351d1a55e55bc43cbfebb.tar.gz portage-daca3458b14261506b5351d1a55e55bc43cbfebb.tar.bz2 portage-daca3458b14261506b5351d1a55e55bc43cbfebb.zip | |
Bug #288083 - Always warn about installed packages masked by license, since
the user likely wants to adjust ACCEPT_LICENSE. For updates masked by license,
warn if --complete-graph or --deep is given, since otherwise it is likely a
waste of time.
svn path=/main/trunk/; revision=14822
Diffstat (limited to 'pym/_emerge/visible.py')
| -rw-r--r-- | pym/_emerge/visible.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/visible.py b/pym/_emerge/visible.py index ee74910c2..c50768dfb 100644 --- a/pym/_emerge/visible.py +++ b/pym/_emerge/visible.py @@ -4,7 +4,7 @@ import portage -def visible(pkgsettings, pkg): +def visible(pkgsettings, pkg, ignore=None): """ Check if a package is visible. This can raise an InvalidDependString exception if LICENSE is invalid. @@ -38,7 +38,8 @@ def visible(pkgsettings, pkg): return False try: if pkgsettings._getMissingLicenses(pkg.cpv, pkg.metadata): - return False + if ignore is None or 'LICENSE' not in ignore: + return False except portage.exception.InvalidDependString: return False return True |