diff --git a/0001-replace-basearch-when-updating-the-ref.patch b/0001-replace-basearch-when-updating-the-ref.patch index 758af040..5e4a4ebb 100644 --- a/0001-replace-basearch-when-updating-the-ref.patch +++ b/0001-replace-basearch-when-updating-the-ref.patch @@ -1,4 +1,4 @@ -From 575fd872661f288c90d2fc8498e4db9ffddc4a9e Mon Sep 17 00:00:00 2001 +From 1e9962be27718171e9291c1b62983229ca49b907 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jan 2017 14:22:43 -0600 Subject: [PATCH] replace ${basearch} when updating the ref @@ -9,11 +9,11 @@ basearch is for the running environment Signed-off-by: Dennis Gilmore --- - pungi/ostree/tree.py | 2 ++ - 1 file changed, 2 insertions(+) + pungi/ostree/tree.py | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/pungi/ostree/tree.py b/pungi/ostree/tree.py -index 68b6d70..2b97af4 100644 +index 68b6d70..94a0be2 100644 --- a/pungi/ostree/tree.py +++ b/pungi/ostree/tree.py @@ -16,6 +16,7 @@ @@ -24,11 +24,12 @@ index 68b6d70..2b97af4 100644 from kobo import shortcuts from pungi.util import makedirs -@@ -67,6 +68,7 @@ class Tree(OSTree): +@@ -67,6 +68,8 @@ class Tree(OSTree): return ref = get_ref_from_treefile(self.treefile) commitid = get_commitid_from_commitid_file(self.commitid_file) -+ ref = ref.replace('${basearch}', rpmUtils.arch.getBaseArch()) ++ if ref is not None: ++ ref = ref.replace('${basearch}', rpmUtils.arch.getBaseArch()) print('Ref: %r, Commit ID: %r' % (ref, commitid)) if ref and commitid: print('Updating ref')