summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-07-17 14:36:36 +0300
committerLars Wirzenius <liw@liw.fi>2021-07-17 14:53:19 +0300
commit904e75557c3db584c4a71d8111d9e05f904d0490 (patch)
tree2ef654977c1511e079283065770141caae6482ea
parent66bc2949f735c3808704763e0648708fe43560c4 (diff)
downloadvmdb2-904e75557c3db584c4a71d8111d9e05f904d0490.tar.gz
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
-rw-r--r--vmdb/plugins/debootstrap_plugin.py6
1 files changed, 5 insertions, 1 deletions
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"]