From 5dfcdde01037ac48d8649f0645c926870f6941d7 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Nov 16 2018 23:52:59 +0000 Subject: also check the NVRA if it's specified in the overrides list --- 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))