diff --git a/tests/z_rpminfo/check-rpminfo.py b/tests/z_rpminfo/check-rpminfo.py index 34fc96c..0cf250e 100644 --- a/tests/z_rpminfo/check-rpminfo.py +++ b/tests/z_rpminfo/check-rpminfo.py @@ -63,6 +63,7 @@ finalret = 0 for pkg in sack: for attr, val in required_attrs.iteritems(): nvr = '{0}-{1}-{2}'.format(pkg['name'], pkg['version'], pkg['release']) + nvra = '{0}-{1}-{2}.{3}'.format(pkg['name'], pkg['version'], pkg['release'], pkg['arch']) if pkg.name in special_overrides: if attr in special_overrides[pkg.name]: skip('{0}: {1} listed in special_overrides'.format(pkg.remote_path, attr)) @@ -71,6 +72,10 @@ for pkg in sack: if attr in special_overrides[nvr]: skip('{0}: {1} listed in special_overrides'.format(pkg.remote_path, attr)) continue + elif nvra in special_overrides: + if attr in special_overrides[nvra]: + skip('{0}: {1} listed in special_overrides'.format(pkg.remote_path, attr)) + continue if not pkg[attr]: fail('{0}: Missing {1}'.format(pkg.remote_path, attr)) diff --git a/tests/z_rpminfo/special_overrides.txt b/tests/z_rpminfo/special_overrides.txt index de43beb..21e6576 100644 --- a/tests/z_rpminfo/special_overrides.txt +++ b/tests/z_rpminfo/special_overrides.txt @@ -495,3 +495,41 @@ fwupdate-efi-9-8.el7.centos: packager fwupdate-efi-9-8.el7.centos: vendor fwupdate-libs-9-8.el7.centos: packager fwupdate-libs-9-8.el7.centos: vendor +ruby-2.0.0.648-33.el7_4.armv7hl: packager +ruby-2.0.0.648-33.el7_4.armv7hl: vendor +ruby-devel-2.0.0.648-33.el7_4.armv7hl: packager +ruby-devel-2.0.0.648-33.el7_4.armv7hl: vendor +ruby-libs-2.0.0.648-33.el7_4.armv7hl: packager +ruby-libs-2.0.0.648-33.el7_4.armv7hl: vendor +ruby-tcltk-2.0.0.648-33.el7_4.armv7hl: packager +ruby-tcltk-2.0.0.648-33.el7_4.armv7hl: vendor +rubygem-bigdecimal-1.2.0-33.el7_4.armv7hl: packager +rubygem-bigdecimal-1.2.0-33.el7_4.armv7hl: vendor +rubygem-io-console-0.4.2-33.el7_4.armv7hl: packager +rubygem-io-console-0.4.2-33.el7_4.armv7hl: vendor +rubygem-json-1.7.7-33.el7_4.armv7hl: packager +rubygem-json-1.7.7-33.el7_4.armv7hl: vendor +rubygem-psych-2.0.0-33.el7_4.armv7hl: packager +rubygem-psych-2.0.0-33.el7_4.armv7hl: vendor +cockpit-160-1.el7.centos.armv7hl: packager +cockpit-160-1.el7.centos.armv7hl: vendor +cockpit-bridge-160-1.el7.centos.armv7hl: packager +cockpit-bridge-160-1.el7.centos.armv7hl: vendor +cockpit-dashboard-160-1.el7.centos.armv7hl: packager +cockpit-dashboard-160-1.el7.centos.armv7hl: vendor +cockpit-doc-160-1.el7.centos.armv7hl: packager +cockpit-doc-160-1.el7.centos.armv7hl: vendor +cockpit-docker-160-1.el7.centos.armv7hl: packager +cockpit-docker-160-1.el7.centos.armv7hl: vendor +cockpit-machines-160-1.el7.centos.armv7hl: packager +cockpit-machines-160-1.el7.centos.armv7hl: vendor +cockpit-packagekit-160-1.el7.centos.armv7hl: packager +cockpit-packagekit-160-1.el7.centos.armv7hl: vendor +cockpit-pcp-160-1.el7.centos.armv7hl: packager +cockpit-pcp-160-1.el7.centos.armv7hl: vendor +cockpit-tests-160-1.el7.centos.armv7hl: packager +cockpit-tests-160-1.el7.centos.armv7hl: vendor +cockpit-ws-160-1.el7.centos.armv7hl: packager +cockpit-ws-160-1.el7.centos.armv7hl: vendor +python-cheetah-2.4.4-5.el7.armv7hl: packager +python-cheetah-2.4.4-5.el7.armv7hl: vendor