Backport PR #4181 to fix a typo in the image type override patch
parent
487e6dcdc6
commit
b912ffd10e
@ -0,0 +1,29 @@
|
|||||||
|
From 3e0b8103d26d4430de391635e699c0035bc39d36 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Williamson <awilliam@redhat.com>
|
||||||
|
Date: Thu, 22 Aug 2024 09:44:50 -0700
|
||||||
|
Subject: [PATCH] Fix a typo in the kiwi image type attribute override patch
|
||||||
|
|
||||||
|
This colon was duplicated, which is syntactically invalid and
|
||||||
|
prevents the file from loading at all.
|
||||||
|
|
||||||
|
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||||
|
---
|
||||||
|
plugins/builder/kiwi.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/plugins/builder/kiwi.py b/plugins/builder/kiwi.py
|
||||||
|
index 1b4a9481..369071ef 100644
|
||||||
|
--- a/plugins/builder/kiwi.py
|
||||||
|
+++ b/plugins/builder/kiwi.py
|
||||||
|
@@ -389,7 +389,7 @@ class KiwiCreateImageTask(BaseBuildTask):
|
||||||
|
'--description', os.path.join(os.path.basename(scmsrcdir), base_path),
|
||||||
|
'--target-dir', target_dir,
|
||||||
|
])
|
||||||
|
- for typeattr in self.opts.get('type_attr', [])::
|
||||||
|
+ for typeattr in self.opts.get('type_attr', []):
|
||||||
|
cmd.extend(['--set-type-attr', typeattr])
|
||||||
|
rv = broot.mock(['--cwd', broot.tmpdir(within=True), '--chroot', '--'] + cmd)
|
||||||
|
if rv:
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
Loading…
Reference in new issue