From 661dd3a70c7bee913f1a8c257d22751f8ea7766d Mon Sep 17 00:00:00 2001 From: Mike Bonnet Date: Oct 25 2017 16:01:08 +0000 Subject: protonmsg: include the arch in the headers of rpm sign messages Including the arch in the headers may be useful for filtering. --- diff --git a/plugins/hub/protonmsg.py b/plugins/hub/protonmsg.py index 417c2f4..408e368 100644 --- a/plugins/hub/protonmsg.py +++ b/plugins/hub/protonmsg.py @@ -206,7 +206,8 @@ def prep_rpm_sign(cbtype, *args, **kws): 'release': kws['build']['release'], 'rpm_name': kws['rpm']['name'], 'rpm_version': kws['rpm']['version'], - 'rpm_release': kws['rpm']['release']} + 'rpm_release': kws['rpm']['release'], + 'rpm_arch': kws['rpm']['arch']} queue_msg(address, props, kws) def _prep_tag_msg(address, cbtype, kws): diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py index a223bd6..5b71147 100644 --- a/tests/test_plugins/test_protonmsg.py +++ b/tests/test_plugins/test_protonmsg.py @@ -115,12 +115,14 @@ class TestProtonMsg(unittest.TestCase): 'release': '1'} rpm = {'name': 'test-pkg-subpkg', 'version': '2.0', - 'release': '2'} + 'release': '2', + 'arch': 'x86_64'} sigkey = 'a1b2c3d4' protonmsg.prep_rpm_sign('postRPMSign', sigkey=sigkey, sighash='fedcba9876543210', build=build, rpm=rpm) self.assertMsg('sign.rpm', type='RPMSign', sigkey=sigkey, rpm_name=rpm['name'], rpm_version=rpm['version'], rpm_release=rpm['release'], + rpm_arch='x86_64', **build) def test_prep_rpm_sign_no_sigkey(self): @@ -129,7 +131,8 @@ class TestProtonMsg(unittest.TestCase): 'release': '1'} rpm = {'name': 'test-pkg-subpkg', 'version': '2.0', - 'release': '2'} + 'release': '2', + 'arch': 'x86_64'} sigkey = '' protonmsg.prep_rpm_sign('postRPMSign', sigkey=sigkey, sighash='fedcba9876543210', build=build, rpm=rpm)