From 39a3becffb86a6765f6e5c2aeb4a84ad62a2226c Mon Sep 17 00:00:00 2001
From: Guillaume Endignoux <guillaumee@google.com>
Date: Wed, 13 May 2020 12:35:10 +0200
Subject: [PATCH] Address review comments.
---
deploy.py | 5 +++--
setup.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/deploy.py b/deploy.py
index 3b7e89f..aae8e8f 100755
--- a/deploy.py
+++ b/deploy.py
@@ -395,8 +395,9 @@ class OpenSKInstaller:
elf2tab_ver = self.checked_command_output(["elf2tab", "--version"]).split(
"\n", maxsplit=1)[0]
if elf2tab_ver != "elf2tab 0.5.0":
- fatal("Unsupported elf2tab version {!a}. Please use 0.5.0.".format(
- elf2tab_ver))
+ error(
+ ("Detected unsupported elf2tab version {!a}. The following "
+ "commands may fail. Please use 0.5.0 instead.").format(elf2tab_ver))
os.makedirs(self.tab_folder, exist_ok=True)
tab_filename = os.path.join(self.tab_folder,
"{}.tab".format(self.args.application))
diff --git a/setup.sh b/setup.sh
index 439003b..493297f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -90,4 +90,4 @@ pip3 install --user --upgrade 'tockloader~=1.4' six intelhex
rustup target add thumbv7em-none-eabi
# Install dependency to create applications.
-cargo install elf2tab
+cargo install elf2tab --version 0.5.0
--
GitLab