From 1a91c9a91e529e678b3f320958d45fd645a37af6 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sun, 18 Dec 2016 03:34:53 +0000 Subject: [PATCH] Deal with new RPMSign messages by koji v1.11.0 and maybe higher but who knows Signed-off-by: Patrick Uiterwijk --- roles/koji_hub/templates/fedmsg-koji-plugin.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/roles/koji_hub/templates/fedmsg-koji-plugin.py b/roles/koji_hub/templates/fedmsg-koji-plugin.py index 905275c28b..38d2ed55be 100644 --- a/roles/koji_hub/templates/fedmsg-koji-plugin.py +++ b/roles/koji_hub/templates/fedmsg-koji-plugin.py @@ -112,10 +112,18 @@ def get_message_body(topic, *args, **kws): msg['tag_id'] = kws['repo']['tag_id'] msg['repo_id'] = kws['repo']['id'] elif topic == 'rpm.sign': - msg['attribute'] = kws['attribute'] - msg['old'] = kws['old'] - msg['new'] = kws['new'] - msg['info'] = kws['info'] + if 'attribute' in kws: + # v1.10.1 and earlier + msg['attribute'] = kws['attribute'] + msg['old'] = kws['old'] + msg['new'] = kws['new'] + msg['info'] = kws['info'] + else: + # v1.11.0 (and maybe higher, but who knows) + msg['sigkey'] = kws['sigkey'] + msg['sighash'] = kws['sighash'] + msg['build'] = kws['build'] + msg['rpm'] = kws['rpm'] return msg