Merge branch 'i9ce' with version 1.35.1-3 into 'i9e'

i9e changed/i9e/koji-1.35.1-3.el9.inferit
Sergey Cherevko 3 months ago
commit ac040d21b2
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -0,0 +1,25 @@
From a0498970e73384a3bce62bc28f5f98f4feeabaff Mon Sep 17 00:00:00 2001
From: Igor Raits <igor.raits@gmail.com>
Date: Nov 05 2024 13:53:22 +0000
Subject: repos: check for newer create event
When the repo was just created, it has create_event that is the same as
we are checking so the repo will never be considered latest.
---
diff --git a/kojihub/repos.py b/kojihub/repos.py
index 5fc08ed..9a7fd03 100644
--- a/kojihub/repos.py
+++ b/kojihub/repos.py
@@ -333,7 +333,7 @@ def symlink_if_latest(repo):
clauses = [
['tag_id', '=', repo['tag_id']],
['state', '=', koji.REPO_READY],
- ['create_event', '>=', repo['create_event']]]
+ ['create_event', '>', repo['create_event']]]
if repo['dist']:
clauses.append(['dist', 'IS', True])
else:

@ -9,7 +9,7 @@
Name: koji
Version: 1.35.1
Release: 2%{?dist}.inferit
Release: 3%{?dist}.inferit
# the included arch lib from yum's rpmUtils is GPLv2+
# Automatically converted from old format: LGPLv2 and GPLv2+ - review is highly recommended.
License: LicenseRef-Callaway-LGPLv2 AND GPL-2.0-or-later
@ -17,6 +17,8 @@ Summary: Build system tools
URL: https://pagure.io/koji/
Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2
Patch1: https://pagure.io/koji/pull-request/4258.patch#/0001-repos-check-for-newer-create-event.patch
# Not upstreamable
Patch101: pr4228-wait-repo-current.patch
# MSVSphere
@ -364,6 +366,9 @@ done
%systemd_postun kojira.service
%changelog
* Thu Nov 07 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.35.1-3.inferit
- Update to 1.35.1-3
* Thu Oct 24 2024 Mike McLean <mikem@redhat.com> - 1.35.1-2
- Backport PR #4228: wait for a current repo by default

Loading…
Cancel
Save