From 3071b82c68c862ac1b3a2b1ae7468bf23e410aba Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Nov 08 2017 13:21:49 +0000 Subject: Display license info in CLI's rpminfo and Web UI Fixes: https://pagure.io/koji/issue/683 --- diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py index dab88ee..0a4da69 100644 --- a/cli/koji_cli/commands.py +++ b/cli/koji_cli/commands.py @@ -3020,6 +3020,8 @@ def anon_handle_rpminfo(goptions, session, args): print("Built: %s" % time.strftime('%a, %d %b %Y %H:%M:%S %Z', time.localtime(info['buildtime']))) print("SIGMD5: %(payloadhash)s" % info) print("Size: %(size)s" % info) + headers = session.getRPMHeaders(rpmID=info['id'], headers=["license"]) + print("License: %(license)s" % headers) if not info.get('external_repo_id', 0): print("Build ID: %(build_id)s" % info) if info['buildroot_id'] is None: diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index 3eaf46e..56dfd3e 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -1380,9 +1380,10 @@ def rpminfo(environ, rpmID, fileOrder='name', fileStart=None, buildrootOrder='-i values['enhances'].sort(_sortbyname) else: values['optional_deps'] = False - headers = server.getRPMHeaders(rpm['id'], headers=['summary', 'description']) + headers = server.getRPMHeaders(rpm['id'], headers=['summary', 'description', 'license']) values['summary'] = koji.fixEncoding(headers.get('summary')) values['description'] = koji.fixEncoding(headers.get('description')) + values['license'] = koji.fixEncoding(headers.get('license')) buildroots = kojiweb.util.paginateMethod(server, values, 'listBuildroots', kw={'rpmID': rpm['id']}, start=buildrootStart, dataName='buildroots', prefix='buildroot', order=buildrootOrder) diff --git a/www/kojiweb/rpminfo.chtml b/www/kojiweb/rpminfo.chtml index 38b7a00..10fc4ec 100644 --- a/www/kojiweb/rpminfo.chtml +++ b/www/kojiweb/rpminfo.chtml @@ -64,6 +64,9 @@ $rpm.payloadhash + + License$license + #if $builtInRoot Buildroot$util.brLabel($builtInRoot)