From 20a5d009614b0008a67a2b3a460224835aa77ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Wed, 3 May 2023 14:32:26 +0200 Subject: [PATCH] Backport patches --- 1671.patch | 28 ++++++++++++++++++++++++++++ pungi.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 1671.patch diff --git a/1671.patch b/1671.patch new file mode 100644 index 00000000..6204f3e2 --- /dev/null +++ b/1671.patch @@ -0,0 +1,28 @@ +From b8b6b46ce7df2b80be110dd93cc795eb47a78549 Mon Sep 17 00:00:00 2001 +From: Aurélien Bompard +Date: May 03 2023 12:20:57 +0000 +Subject: Set the priority in the fedora-messaging notifier + + +According to [infra ticket #10899](https://pagure.io/fedora-infrastructure/issue/10899), +ostree messages should have prioriy 3. + +Signed-off-by: Aurélien Bompard + +--- + +diff --git a/pungi/scripts/fedmsg_notification.py b/pungi/scripts/fedmsg_notification.py +index db5dc01..e2c05c5 100644 +--- a/pungi/scripts/fedmsg_notification.py ++++ b/pungi/scripts/fedmsg_notification.py +@@ -14,6 +14,9 @@ def send(cmd, data): + topic = "compose.%s" % cmd.replace("-", ".").lower() + try: + msg = fedora_messaging.api.Message(topic="pungi.{}".format(topic), body=data) ++ if cmd == "ostree": ++ # https://pagure.io/fedora-infrastructure/issue/10899 ++ msg.priority = 3 + fedora_messaging.api.publish(msg) + except fedora_messaging.exceptions.PublishReturned as e: + print("Fedora Messaging broker rejected message %s: %s" % (msg.id, e)) + diff --git a/pungi.spec b/pungi.spec index 12defd0d..9d8fd632 100644 --- a/pungi.spec +++ b/pungi.spec @@ -2,12 +2,13 @@ Name: pungi Version: 4.3.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Distribution compose tool License: GPL-2.0-only URL: https://pagure.io/pungi Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: https://pagure.io/pungi/pull-request/1671.patch BuildRequires: make BuildRequires: python3-pytest @@ -138,6 +139,9 @@ rm %{buildroot}%{_bindir}/pungi %{_bindir}/%{name}-wait-for-signed-ostree-handler %changelog +* Wed May 03 2023 Lubomír Sedlář - 4.3.8-1 +- Set priority for Fedora messages + * Thu Mar 30 2023 Haibo Lin - 4.3.8-1 - createiso: Update possibly changed file on DVD (lsedlar) - pkgset: Stop reuse if configuration changed (lsedlar)