From 2a5346284a0297aef764d8001664b7a4d575b4b9 Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Sep 25 2018 13:03:19 +0000 Subject: [PATCH 1/3] Dont depend on yum yum is planned to be dropped in F30+ https://fedoraproject.org/wiki/Changes/Deprecate_YUM_3 --- diff --git a/tests.yml b/tests.yml index a2e65f2..8d82cd5 100644 --- a/tests.yml +++ b/tests.yml @@ -19,7 +19,6 @@ state: latest with_items: - libabigail - - yum - libtaskotron-core - libtaskotron-fedora register: dnf_output From 555314a2a3938b073f9226d0283d2e29042ccbe1 Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Sep 25 2018 13:18:28 +0000 Subject: [PATCH 2/3] Use hawkey instead of yum Replace splitFilename with hawkey.split_nevra --- diff --git a/run_abipkgdiff.py b/run_abipkgdiff.py index d1a79cf..d9ba26f 100755 --- a/run_abipkgdiff.py +++ b/run_abipkgdiff.py @@ -7,8 +7,8 @@ import subprocess import time import math import logging +import hawkey -from rpmUtils.miscutils import splitFilename from libtaskotron import check from libtaskotron import arch_utils @@ -107,9 +107,10 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): stable_debuginfo_rpm.append(rpm) else: stable_rpms.append(rpm) - (n, v, r, e, a) = splitFilename(rpm) - rpm_details = {'rpm': rpm, 'name': n, 'version': v, 'release': r, - 'e': e, 'arch': a} + nevra = hawkey.split_nevra(rpm) + rpm_details = {'rpm': rpm, 'name': nevra.name, + 'version': nevra.version, 'release': nevra.release, + 'e': nevra.epoch, 'arch': nevra.arch} stable_rpms_detail.append(rpm_details) ''' @@ -125,9 +126,10 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): update_debuginfo_rpm.append(rpm) else: update_rpms.append(rpm) - (n, v, r, e, a) = splitFilename(rpm) - rpm_details = {'rpm': rpm, 'name': n, 'version': v, - 'release': r, 'e': e, 'arch': a} + nevra = hawkey.split_nevra(rpm) + rpm_details = {'rpm': rpm, 'name': nevra.name, + 'version': nevra.version, 'release': nevra.release, + 'e': nevra.epoch, 'arch': nevra.arch} update_rpms_detail.append(rpm_details) # Prepare abipkgdiff command with required args From 0e651ee3fa42bec683ec45c5146e79b1f3f0190c Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Sep 26 2018 09:32:12 +0000 Subject: [PATCH 3/3] Depend explicitly on hawkey --- diff --git a/tests.yml b/tests.yml index 8d82cd5..a0d7894 100644 --- a/tests.yml +++ b/tests.yml @@ -19,6 +19,7 @@ state: latest with_items: - libabigail + - python2-hawkey - libtaskotron-core - libtaskotron-fedora register: dnf_output