From 2afdee795a5818d748dc7a3da278d23ade7c025b Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Nov 13 2018 11:02:54 +0000 Subject: Pass all debug information to abigail Debug information is split to several *debuginfo* packages and one *debugsource* package these days. Pass them all to abigail so it can perform correct check. --- diff --git a/run_abipkgdiff.py b/run_abipkgdiff.py index d9ba26f..b14f5b2 100755 --- a/run_abipkgdiff.py +++ b/run_abipkgdiff.py @@ -103,7 +103,7 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): # dot(.) is needed during search to avoid getting result from ppc64le # arch while searching fro ppc64 if (arch + ".") in rpm: - if 'debuginfo' in rpm: + if ('debuginfo' in rpm) or ('debugsource' in rpm): stable_debuginfo_rpm.append(rpm) else: stable_rpms.append(rpm) @@ -122,7 +122,7 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): if (arch + ".") in rpm: # dot(.) is needed during search to avoid getting result from ppc64le # arch while searching fro ppc64 - if 'debuginfo' in rpm: + if ('debuginfo' in rpm) or ('debugsource' in rpm): update_debuginfo_rpm.append(rpm) else: update_rpms.append(rpm) @@ -138,13 +138,13 @@ def test_arch(arch, stable_rpmsdir, update_rpmsdir, detail): # dependent packages base_command = ['abipkgdiff', '--dso-only'] - if len(stable_debuginfo_rpm) == 1: + for rpm in stable_debuginfo_rpm: base_command.extend(['--d1', - stable_rpmsdir + '/' + stable_debuginfo_rpm[0]]) + stable_rpmsdir + '/' + rpm]) - if len(update_debuginfo_rpm) == 1: + for rpm in update_debuginfo_rpm: base_command.extend(['--d2', - update_rpmsdir + '/' + update_debuginfo_rpm[0]]) + update_rpmsdir + '/' + rpm]) if not ((len(update_rpms_detail) == 0) and (len(stable_rpms_detail) == 0)): detail.output.append("On %s architecture\n" % arch)