From 7f7711c57fb7bdad5ea809e9b6a798d3860cb67f Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 19 2017 20:24:16 +0000 Subject: avoid using kobo --- diff --git a/src/bin/koji-get-rpm-fields-in-build b/src/bin/koji-get-rpm-fields-in-build index 90b1eb7..b9b420a 100755 --- a/src/bin/koji-get-rpm-fields-in-build +++ b/src/bin/koji-get-rpm-fields-in-build @@ -1,6 +1,5 @@ #!/usr/bin/python -import kobo.rpmlib import koji from optparse import OptionParser import os.path @@ -30,8 +29,8 @@ def getRPMChangeLogs(hdr, max=-1, timeformat="%a %b %d %Y"): if max == 0: return s = [] - names = kobo.rpmlib.get_header_field(hdr, 'CHANGELOGNAME') - text = kobo.rpmlib.get_header_field(hdr, 'CHANGELOGTEXT') + names = koji.get_header_field(hdr, 'CHANGELOGNAME') + text = koji.get_header_field(hdr, 'CHANGELOGTEXT') i = 0 while (i < max or max < 0) and i < len(names): s.append(("%s\n%s\n" % (names[i], text[i]),)) @@ -50,7 +49,7 @@ def get_info(opts, builds, rpmfield): # no RPMs in this build, skip it continue rpmpath = os.path.join(pinfo.build(bld), pinfo.rpm(rpms[0])) - hdr = kobo.rpmlib.get_rpm_header(rpmpath) + hdr = koji.get_rpm_header(rpmpath) if rpmfield == 'changelog': changelog = getRPMChangeLogs(hdr) print '%s:' % bld['nvr'] @@ -58,7 +57,7 @@ def get_info(opts, builds, rpmfield): for line in log: print line else: - field = kobo.rpmlib.get_header_field(hdr, rpmfield) + field = koji.get_header_field(hdr, rpmfield) print '%s: %s' % (bld['nvr'], field) if __name__ == '__main__': diff --git a/src/bin/koji-get-rpm-fields-in-tag b/src/bin/koji-get-rpm-fields-in-tag index 3504ee6..c30ecbb 100755 --- a/src/bin/koji-get-rpm-fields-in-tag +++ b/src/bin/koji-get-rpm-fields-in-tag @@ -1,6 +1,5 @@ #!/usr/bin/python -import kobo.rpmlib import koji from optparse import OptionParser import os.path @@ -36,8 +35,8 @@ def getRPMChangeLogs(hdr, max=-1, timeformat="%a %b %d %Y"): if max == 0: return s = [] - names = kobo.rpmlib.get_header_field(hdr, 'CHANGELOGNAME') - text = kobo.rpmlib.get_header_field(hdr, 'CHANGELOGTEXT') + names = koji.get_header_field(hdr, 'CHANGELOGNAME') + text = koji.get_header_field(hdr, 'CHANGELOGTEXT') i = 0 while (i < max or max < 0) and i < len(names): s.append(("%s\n%s\n" % (names[i], text[i]),)) @@ -57,7 +56,7 @@ def get_info(opts, tag, rpmfield): # no RPMs in this build, skip it continue rpmpath = os.path.join(pinfo.build(b), pinfo.rpm(rpms[0])) - hdr = kobo.rpmlib.get_rpm_header(rpmpath) + hdr = koji.get_rpm_header(rpmpath) if rpmfield == 'changelog': changelog = getRPMChangeLogs(hdr) print '%s:' % b['nvr'] @@ -65,7 +64,7 @@ def get_info(opts, tag, rpmfield): for line in log: print line else: - field = kobo.rpmlib.get_header_field(hdr, rpmfield) + field = koji.get_header_field(hdr, rpmfield) print '%s: %s' % (b['nvr'], field) if __name__ == '__main__':