[rpms/rpkg] 1.70-1: Backport: Isolated container-build should allow arches override

[rpms/rpkg] 1.70-1: Backport: Isolated container-build should allow arches override

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

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 4ed51c3496c19cbfae31f1b96a17f40fc3054dfc
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2019-11-14T15:29:43+00:00
            Stats  : +65/-5 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/4ed51c3496c19cbfae31f1b96a17f40fc3054dfc?branch=1.70-1

            Log:
            Backport: Isolated container-build should allow arches override

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

---
diff --git a/0006-Isolated-container-build-should-allow-arches-overrid.patch b/0006-Isolated-container-build-should-allow-arches-overrid.patch
new file mode 100644
index 0000000..462a777
--- /dev/null
+++ b/0006-Isolated-container-build-should-allow-arches-overrid.patch
@@ -0,0 +1,57 @@
+From c0c26f8512e5369b4616a98a34de306c666c709f Mon Sep 17 00:00:00 2001
+From: Robert Cerven <rcerven@redhat.com>
+Date: Mon, 4 Nov 2019 15:29:06 +0100
+Subject: [PATCH] Isolated container-build should allow arches override
+
+JIRA: OSBS-8025
+Merges: https://pagure.io/rpkg/pull-request/471
+
+Signed-off-by: Robert Cerven <rcerven@redhat.com>
+---
+ pyrpkg/__init__.py | 6 ++++--
+ pyrpkg/cli.py      | 4 ++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index b139fe0..bcacca1 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -3133,9 +3133,11 @@ class Commands(object):
+ 
+             scratch = opts.get('scratch')
+             arches = opts.get('arches')
++            isolated = opts.get('isolated')
+             if arches:
+-                if not scratch:
+-                    raise rpkgError('Cannot override arches for non-scratch builds')
++                if not (scratch or isolated):
++                    raise rpkgError('Cannot override arches for non-scratch and non-isolated '
++                                    'builds')
+                 task_opts['arch_override'] = ' '.join(arches)
+ 
+             if flatpak:
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 0036136..eb17284 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1566,7 +1566,7 @@ see API KEY section of copr-cli(1) man page.
+             '--arches',
+             action='store',
+             nargs='*',
+-            help='Limit a scratch build to an arch. May have multiple arches.')
++            help='Limit a scratch or a isolated build to an arch. May have multiple arches.')
+ 
+         parser.add_argument(
+             '--skip-remote-rules-validation',
+@@ -2270,7 +2270,7 @@ see API KEY section of copr-cli(1) man page.
+             build_id, auth_method, oidc_id_provider, oidc_client_id,
+             oidc_client_secret, oidc_scopes)
+         if not self.args.q:
+-                print('The module build #{0} was cancelled'.format(build_id))
++            print('The module build #{0} was cancelled'.format(build_id))
+ 
+     def module_build_info(self):
+         """Show information about an MBS build"""
+-- 
+2.21.0
+

diff --git a/rpkg.spec b/rpkg.spec
index 67ab561..161c257 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,10 +1,6 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python2_sitelib: %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?__python2: %global __python2 %{__python}}
-
 Name:           rpkg
 Version:        1.59
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -26,6 +22,7 @@ Patch2:         0002-Pass-skip_build-option-to-buildContainer.patch
 Patch3:         0003-container-build-add-isolated-argument.patch
 Patch4:         0004-tests-add-container-build-isolated-test.patch
 Patch5:         0005-container-build-add-koji-parent-build-argument.patch
+Patch6:         0006-Isolated-container-build-should-allow-arches-overrid.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Enable python3 build by default
@@ -39,6 +36,9 @@ Patch5:         0005-container-build-add-koji-parent-build-argument.patch
 %global with_python2 0
 %else
 %global with_python2 1
+# sitelib for noarch packages, sitearch for others (remove the unneeded one)
+%{!?python2_sitelib: %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?__python2: %global __python2 %{__python}}
 %endif
 
 %description
@@ -276,6 +276,9 @@ nosetests tests
 
 
 %changelog
+* Thu Nov 14 2019 Ondřej Nosek <onosek@redhat.com> - 1.59-3
+- Backport: Isolated container-build should allow arches override
+
 * Fri Oct 25 2019 Ondrej Nosek <onosek@redhat.com> - 1.59-2
 - Backport: container-build: add --isolated and --koji-parent-build arguments
 - Backport: Pass skip_build option to buildContainer