[rpms/rpkg] 1.70-1: Patch: `commit` command fails on 'containers' namespace

[rpms/rpkg] 1.70-1: Patch: `commit` command fails on 'containers' namespace

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

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 0fead2a26cd25f58677564f24caa1ef00b6a7c69
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2023-06-12T12:44:40+00:00
            Stats  : +45/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/0fead2a26cd25f58677564f24caa1ef00b6a7c69?branch=1.70-1

            Log:
            Patch: `commit` command fails on 'containers' namespace

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

---
diff --git a/0022-commit-command-fails-on-containers-namespace.patch b/0022-commit-command-fails-on-containers-namespace.patch
new file mode 100644
index 0000000..a284abc
--- /dev/null
+++ b/0022-commit-command-fails-on-containers-namespace.patch
@@ -0,0 +1,40 @@
+From 7ade8c1f38efaa8817bd10df6b0928ef70822f6e Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Wed, 17 May 2023 00:32:47 +0200
+Subject: [PATCH] `commit` command fails on 'containers' namespace
+
+Commit failed when 'uses_rpmautospec' tried to search for a specfile.
+There is no specfile in 'containers' namespace repository.
+
+JIRA: RHELCMP-11734
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ pyrpkg/__init__.py | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index f14b055..b45ad8f 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -1872,8 +1872,15 @@ class Commands(object):
+         # construct the git command
+         # We do this via subprocess because the git module is terrible.
+         cmd = ['git', 'commit']
+-        if not self.is_retired() and self.uses_rpmautospec:
+-            cmd.append('--allow-empty')
++        if not self.is_retired():
++            try:
++                # raises exception when a specfile is missing
++                # (for example when processing "containers" namespace repository)
++                uses_rpmautospec = self.uses_rpmautospec
++            except Exception:
++                uses_rpmautospec = False
++            if uses_rpmautospec:
++                cmd.append('--allow-empty')
+         if signoff:
+             cmd.append('-s')
+         if self.quiet:
+-- 
+2.40.1
+

diff --git a/rpkg.spec b/rpkg.spec
index 17e44ee..ae4605a 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
 Version:        1.66
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -55,6 +55,7 @@ Patch18:        0018-Config-file-option-to-skip-the-hook-script-creation.patch
 Patch19:        0019-Pre-push-hook-won-t-check-private-branches.patch
 Patch20:        0020-Use-release-s-rpmdefines-in-unused-sources-check.patch
 Patch21:        0021-Do-not-require-sources-file-for-all-namespaces.patch
+Patch22:        0022-commit-command-fails-on-containers-namespace.patch
 
 %description
 Python library for interacting with rpm+git
@@ -271,6 +272,9 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 
 
 %changelog
+* Mon Jun 12 2023 Ondřej Nosek <onosek@redhat.com> - 1.66-8
+- Patch: `commit` command fails on 'containers' namespace
+
 * Fri Apr 28 2023 Ondřej Nosek <onosek@redhat.com> - 1.66-7
 - Patch: Do not require 'sources' file for all namespaces
 - Use release's rpmdefines in unused sources check