diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-11-16 00:35:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-11-16 00:35:08 +0000 |
| commit | 05eb7b6b18c890dc52faa9858ded25bacb7086eb (patch) | |
| tree | 4daefcdcb7df21e495d6c67cc5002fe44de6522c /pym/_emerge/visible.py | |
| parent | a4a328e2f9711fd6b8b04c21a31c4e81b08a32fd (diff) | |
| download | portage-05eb7b6b18c890dc52faa9858ded25bacb7086eb.tar.gz portage-05eb7b6b18c890dc52faa9858ded25bacb7086eb.tar.bz2 portage-05eb7b6b18c890dc52faa9858ded25bacb7086eb.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. (trunk r14822)
svn path=/main/branches/2.1.7/; revision=14839
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 |