[rpms/rpkg] 1.70-1: Patch: Submitting the module build - duplicate timeout

[rpms/rpkg] 1.70-1: Patch: Submitting the module build - duplicate timeout

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

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 367324ee445933ebb61b4445f5682a9f2050e8ba
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2025-12-11T17:08:45+00:00
            Stats  : +40/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/367324ee445933ebb61b4445f5682a9f2050e8ba?branch=1.70-1

            Log:
            Patch: Submitting the module build - duplicate timeout

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

---
diff --git a/0007-Submitting-the-module-build-duplicate-timeout.patch b/0007-Submitting-the-module-build-duplicate-timeout.patch
new file mode 100644
index 0000000..32006c8
--- /dev/null
+++ b/0007-Submitting-the-module-build-duplicate-timeout.patch
@@ -0,0 +1,35 @@
+From 7ccbd04656ca09617fb6b422365e0f35babd62ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
+Date: Thu, 11 Dec 2025 17:29:39 +0100
+Subject: [PATCH] Submitting the module build - duplicate timeout
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The change was suggested by a static code checker, but it caused
+duplicate timeout argument that was passed in kwargs.
+
+Fixes: #766
+JIRA: RHELCMP-15058
+
+Signed-off-by: Ondřej Nosek <onosek@redhat.com>
+---
+ pyrpkg/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 8df338c..6f4d63b 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4199,7 +4199,7 @@ class Commands(object):
+                 data = body
+             auth = requests_gssapi.HTTPSPNEGOAuth(
+                 mutual_authentication=requests_gssapi.OPTIONAL)
+-            resp = requests.request(verb, url, data=data, auth=auth, timeout=1800, **kwargs)
++            resp = requests.request(verb, url, data=data, auth=auth, **kwargs)  # noqa: S113
+             if resp.status_code == 401:
+                 raise rpkgError('MBS authentication using Kerberos failed. '
+                                 'Make sure you have a valid Kerberos ticket.')
+-- 
+2.52.0
+

diff --git a/rpkg.spec b/rpkg.spec
index 36dc585..6124334 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
 Version:        1.69
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 # Automatically converted from old format: GPLv2+ and LGPLv2 - reviewed
@@ -52,6 +52,7 @@ Patch3:         0003-Use-ruff-code-checker-instead-of-bandit.patch
 Patch4:         0004-update-interactive-editor-is-broken.patch
 Patch5:         0005-Check-the-correct-sorting-of-imports-from-now-on.patch
 Patch6:         0006-_run_command-timeout-is-not-supported-in-Python-2.patch
+Patch7:         0007-Submitting-the-module-build-duplicate-timeout.patch
 
 %description
 Python library for interacting with rpm+git
@@ -282,6 +283,9 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 
 
 %changelog
+* Thu Dec 11 2025 Ondřej Nosek <onosek@redhat.com> - 1.69-5
+- Patch: Submitting the module build - duplicate timeout
+
 * Tue Dec 09 2025 Ondřej Nosek <onosek@redhat.com> - 1.69-4
 - Patch: _run_command: timeout is not supported in Python 2