Backport patch to replace basearch in ostree ref in fedmsg

0001-Make-sure-basearch-is-also-replaced-with-config-ostr.patch

@@ -0,0 +1,34 @@
+From c9c5fcac945ae0489c667bfe5ebeeeb617eecf20 Mon Sep 17 00:00:00 2001
+From: Patrick Uiterwijk <patrick@puiterwijk.org>
+Date: Wed, 9 Jan 2019 21:39:33 +0100
+Subject: [PATCH] Make sure ${basearch} is also replaced with
+ config['ostree_ref']
+
+Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
+---
+ pungi/phases/ostree.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py
+index 8bbe4434..a6190d75 100644
+--- a/pungi/phases/ostree.py
++++ b/pungi/phases/ostree.py
+@@ -6,6 +6,7 @@ import os
+ from kobo import shortcuts
+ from kobo.threads import ThreadPool, WorkerThread
+ 
++from pungi.arch_utils import getBaseArch
+ from .base import ConfigGuardedPhase
+ from .. import util
+ from ..ostree.utils import get_ref_from_treefile, get_commitid_from_commitid_file
+@@ -99,6 +100,7 @@ class OSTreeThread(WorkerThread):
+                 logger=self.pool._logger,
+             )
+             ref = config.get("ostree_ref") or original_ref
++            ref = ref.replace("${basearch}", getBaseArch(arch))
+             # 'pungi-make-ostree tree' writes commitid to commitid.log in
+             # logdir, except if there was no new commit we will get None
+             # instead. If the commit id could not be read, an exception will be
+-- 
+2.17.2
+

pungi.spec

@@ -1,12 +1,13 @@
 Name:           pungi
 Version:        4.1.32
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Distribution compose tool
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            https://pagure.io/pungi
 Source0:        https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         0001-Make-sure-basearch-is-also-replaced-with-config-ostr.patch
 
 BuildRequires:  python3-nose
 BuildRequires:  python3-mock
@@ -201,6 +202,9 @@ nosetests-3 --exe
 %{_bindir}/%{name}-wait-for-signed-ostree-handler
 
 %changelog
+* Thu Jan 10 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.32-3
+- Replace basearch in ostree ref in message
+
 * Wed Jan 09 2019 Lubomír Sedlář <lsedlar@redhat.com> - 4.1.32-2
 - Drop dependency on python3-enum34