[rpms/fedpkg] 1.48-1: Patch: Update expired token exception instructions

[rpms/fedpkg] 1.48-1: Patch: Update expired token exception instructions

[@ 2026-08-10 21:46 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : a73373a33eb7df56c496e31442a251f76dcdd30d
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2025-02-17T22:11:45+00:00
            Stats  : +40/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/a73373a33eb7df56c496e31442a251f76dcdd30d?branch=1.48-1

            Log:
            Patch: Update expired token exception instructions

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/0034-Update-expired-token-exception-instructions.patch b/0034-Update-expired-token-exception-instructions.patch
new file mode 100644
index 0000000..4605482
--- /dev/null
+++ b/0034-Update-expired-token-exception-instructions.patch
@@ -0,0 +1,35 @@
+From 9323483cad1aaa9a4d2e00388808f4d0683630a5 Mon Sep 17 00:00:00 2001
+From: David Kaufmann <astra@ionic.at>
+Date: Wed, 8 Jan 2025 23:13:16 +0100
+Subject: [PATCH 1/3] Update expired token exception instructions
+
+Signed-off-by: David Kaufmann <astra@ionic.at>
+---
+ fedpkg/utils.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fedpkg/utils.py b/fedpkg/utils.py
+index 0c54ba1..dbee142 100644
+--- a/fedpkg/utils.py
++++ b/fedpkg/utils.py
+@@ -154,7 +154,7 @@ def do_fork(logger, base_url, token, repo_name, namespace, cli_name):
+         if re.search(r"Invalid or expired token", rv_error, re.IGNORECASE):
+             base_error_msg += '\nFor invalid or expired tokens please ' \
+                 'set a new token in your user configuration with:' \
+-                '\n\n\t{0} set-distgit-token <token>\n'.format(cli_name)
++                '\n\n\t{0} set-distgit-token\n'.format(cli_name)
+         raise rpkgError(base_error_msg.format(rv_error))
+ 
+     return True
+@@ -628,7 +628,7 @@ def disable_monitoring(logger, base_url, token, repo_name, namespace, cli_name):
+         if re.search(r"Invalid or expired token", rv_error, re.IGNORECASE):
+             base_error_msg += '\nFor invalid or expired tokens please ' \
+                 'set a new token in your user configuration with:' \
+-                '\n\n\t{0} set-distgit-token <token>\n'.format(cli_name)
++                '\n\n\t{0} set-distgit-token\n'.format(cli_name)
+         raise rpkgError(base_error_msg.format(rv_error))
+ 
+     logger.info("Monitoring of the project was sucessfully disabled.")
+-- 
+2.48.1
+

diff --git a/fedpkg.spec b/fedpkg.spec
index e9c46ca..0ea7b44 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.45
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
@@ -47,6 +47,7 @@ Patch30:        0030-Fix-tests-on-EPEL-9-10.patch
 Patch31:        0031-Add-setuptools-to-dependencies-for-Python-3.12.patch
 Patch32:        0032-Update-expired-token-exception-instructions.patch
 Patch33:        0033-Clone-epel10-branches-with-clone-B.patch
+Patch34:        0034-Update-expired-token-exception-instructions.patch
 
 BuildRequires:  pkgconfig
 BuildRequires:  bash-completion
@@ -129,6 +130,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %changelog
+* Mon Feb 17 2025 Ondřej Nosek <onosek@redhat.com> - 1.45-8
+- Patch: Update expired token exception instructions
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.45-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild