Backport patches
(cherry picked from commit 20a5d00961
(fedora_master))
This commit is contained in:
parent
bfbe9095d2
commit
218b11f1b7
28
1671.patch
Normal file
28
1671.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From b8b6b46ce7df2b80be110dd93cc795eb47a78549 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Aurélien Bompard <aurelien@bompard.org>
|
||||||
|
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 <aurelien@bompard.org>
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
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))
|
||||||
|
|
@ -2,12 +2,13 @@
|
|||||||
|
|
||||||
Name: pungi
|
Name: pungi
|
||||||
Version: 4.3.8
|
Version: 4.3.8
|
||||||
Release: 1%{?dist}.alma
|
Release: 2%{?dist}.alma
|
||||||
Summary: Distribution compose tool
|
Summary: Distribution compose tool
|
||||||
|
|
||||||
License: GPL-2.0-only
|
License: GPL-2.0-only
|
||||||
URL: https://pagure.io/pungi
|
URL: https://pagure.io/pungi
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
|
Patch0: 1671.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: python3-pytest
|
BuildRequires: python3-pytest
|
||||||
@ -164,6 +165,9 @@ rm %{buildroot}%{_bindir}/pungi
|
|||||||
* Tue Jul 25 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-8
|
* Tue Jul 25 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-8
|
||||||
- Option `excluded-packages` for script `pungi-gather-rpms`
|
- Option `excluded-packages` for script `pungi-gather-rpms`
|
||||||
|
|
||||||
|
* Wed May 03 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.8-1
|
||||||
|
- Set priority for Fedora messages
|
||||||
|
|
||||||
* Thu Apr 13 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-7
|
* Thu Apr 13 2023 Stepan Oksanichenko <soksanichenko@cloudlinux.com> - 4.3.7-7
|
||||||
- gather-module can find modules through symlinks
|
- gather-module can find modules through symlinks
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user