[gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/equery/

[Tobias Heinlein]

commit:     9a33ceffe2e0045bf75b1209a90e9a53530d4e0d
Author:     Tobias Heinlein <keytoaster <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 19 16:39:03 2014 +0000
Commit:     Tobias Heinlein <keytoaster <AT> gentoo <DOT> org>
CommitDate: Sat Apr 19 18:23:23 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=9a33ceff

equery: Don't always print the license field (bug #508114).

---
 pym/gentoolkit/equery/meta.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index e2d2124..d3342cd 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -373,12 +373,13 @@ def call_format_functions(best_match, matches):
                useflags = format_useflags(best_match.metadata.use())
                print_sequence(format_list(useflags))
 
-       _license = best_match.environment(["LICENSE"])
-       if QUERY_OPTS["license"]:
-               _license = format_list(_license)
-       else:
-               _license = format_list(_license, "License:     ", " " * 13)
-       print_sequence(_license)
+       if QUERY_OPTS["license"] or not got_opts:
+               _license = best_match.environment(["LICENSE"])
+               if QUERY_OPTS["license"]:
+                       _license = format_list(_license)
+               else:
+                       _license = format_list(_license, "License:     ", " " * 
13)
+               print_sequence(_license)
 
        if QUERY_OPTS["stablereq"]:
                # Get {<Package 'dev-libs/glib-2.20.5'>: [u'ia64', u'm68k', 
...], ...}