From 904e75557c3db584c4a71d8111d9e05f904d0490 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 17 Jul 2021 14:36:36 +0300 Subject: fix: strip spaces and newlines from host architecture When running dpkg --print-architecure, the output contains a newline. This understandably confuses debootstrap, so strip it away. Sponsored-by: author --- vmdb/plugins/debootstrap_plugin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vmdb/plugins/debootstrap_plugin.py b/vmdb/plugins/debootstrap_plugin.py index 9f622a1..4922690 100644 --- a/vmdb/plugins/debootstrap_plugin.py +++ b/vmdb/plugins/debootstrap_plugin.py @@ -19,6 +19,7 @@ import vmdb import subprocess + class DebootstrapPlugin(vmdb.Plugin): def enable(self): self.app.step_runners.add(DebootstrapStepRunner()) @@ -42,7 +43,10 @@ class DebootstrapStepRunner(vmdb.StepRunnerInterface): target = state.tags.get_builder_mount_point(tag) mirror = values["mirror"] keyring = values["keyring"] or None - arch = values["arch"] or subprocess.check_output(['dpkg', '--print-architecture']) + arch = ( + values["arch"] + or subprocess.check_output(["dpkg", "--print-architecture"]).strip() + ) variant = values["variant"] components = values["components"] -- cgit v1.2.1