35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
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
|
||
|
|
|