[rpms/fedpkg] 1.48-1: Work with Bodhi 3

[rpms/fedpkg] 1.48-1: Work with Bodhi 3

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

A new commit has been pushed.

Repo   : rpms/fedpkg
Branch : 1.48-1
Commit : 6a29fadc900ce1faed56519602de2047ab1327b5
Author : Lubomír Sedlář <lsedlar@redhat.com>
Date   : 2017-11-22T08:31:26+01:00
Stats  : +63/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/fedpkg/c/6a29fadc900ce1faed56519602de2047ab1327b5?branch=1.48-1

Log:
Work with Bodhi 3

---
diff --git a/0001-Work-with-Bodhi-3.patch b/0001-Work-with-Bodhi-3.patch
new file mode 100644
index 0000000..e829390
--- /dev/null
+++ b/0001-Work-with-Bodhi-3.patch
@@ -0,0 +1,57 @@
+From 62ac6647efb71bea220def61b75e33a1f121e8bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Tue, 14 Nov 2017 14:41:57 +0100
+Subject: [PATCH] Work with Bodhi 3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507410
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ fedpkg/__init__.py | 4 +++-
+ test/test_cli.py   | 6 +++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index b45645d..dd1c2d9 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -237,7 +237,9 @@ class Commands(pyrpkg.Commands):
+                    '--new', '--release', self.branch_merge,
+                    '--file', 'bodhi.template', self.nvr, '--username',
+                    self.user]
+-        elif bodhi_major_version == 2:
++        elif bodhi_major_version < 4:
++            # Version 3 is compatible with 2, it was bumped for server side
++            # reasons.
+             cmd = ['bodhi', 'updates', 'new', '--file', 'bodhi.template',
+                    '--user', self.user]
+             if bodhi_config['staging']:
+diff --git a/test/test_cli.py b/test/test_cli.py
+index 76e25d5..632367c 100644
+--- a/test/test_cli.py
++++ b/test/test_cli.py
+@@ -146,8 +146,8 @@ class TestUpdate(CliTestCase):
+     @patch('fedpkg.lookaside.FedoraLookasideCache.hash_file')
+     def test_fail_if_bodhi_version_is_not_supported(
+             self, hash_file, hashlib_new, isfile):
+-        # As of writing this test, only supports version v2 and <v2.
+-        self.mock_get_bodhi_version.return_value = [3, 1, 2]
++        # As of writing this test, only supports version v3, v2, and <v2.
++        self.mock_get_bodhi_version.return_value = [4, 1, 2]
+         hashlib_new.return_value.hexdigest.return_value = 'origin hash'
+         hash_file.return_value = 'different hash'
+ 
+@@ -155,7 +155,7 @@ class TestUpdate(CliTestCase):
+ 
+         cli = self.get_cli(cli_cmd)
+         six.assertRaisesRegex(
+-            self, rpkgError, 'This system has bodhi v3, which is unsupported',
++            self, rpkgError, 'This system has bodhi v4, which is unsupported',
+             self.create_bodhi_update, cli)
+ 
+     @patch('os.path.isfile', return_value=True)
+-- 
+2.13.6
+

diff --git a/fedpkg.spec b/fedpkg.spec
index 2cce634..f51a61b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -8,7 +8,7 @@
 
 Name:           fedpkg
 Version:        1.30
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
@@ -18,6 +18,7 @@ Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
 # https://pagure.io/fedpkg/pull-request/162
 Patch0:         update-anongiturl.patch
 Patch1:         0001-Allow-any-parameters-in-construct_build_url.patch
+Patch2:         0001-Work-with-Bodhi-3.patch
 
 BuildArch:      noarch
 
@@ -70,6 +71,7 @@ Provides the fedpkg command for working with dist-git
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__python} setup.py build
@@ -113,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 22 2017 Lubomír Sedlář <lsedlar@redhat.com> - 1.30-5
+- Work with Bodhi 3
+
 * Wed Nov 08 2017 Chenxiong Qi <cqi@redhat.com> - 1.30-4
 - Backport: Allow any parameters in construct_build_url