kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert review suggestion.

Browse Source 
No, we don't want to run: Command '['rustup', '-', '-', 'v', 'e', 'r', 'b', 'o', 's', 'e', 'install', 'nightly-2020-02-03']'
This commit is contained in:
Guillaume Endignoux
2020-04-28 18:00:36 +02:00
parent dc088479db
commit e838356f3b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deploy.py
View File

@@ -310,13 +310,13 @@ class OpenSKInstaller:
# Need to update # Need to update
rustup_install = ["rustup"] rustup_install = ["rustup"]
if self.args.verbose_build: if self.args.verbose_build:
rustup_install.extend("--verbose") rustup_install.extend(["--verbose"])
rustup_install.extend(["install", target_toolchain_fullstring]) rustup_install.extend(["install", target_toolchain_fullstring])
self.checked_command(rustup_install) self.checked_command(rustup_install)
rustup_target = ["rustup"] rustup_target = ["rustup"]
if self.args.verbose_build: if self.args.verbose_build:
rustup_target.extend("--verbose") rustup_target.extend(["--verbose"])
rustup_target.extend( rustup_target.extend(
["target", "add", SUPPORTED_BOARDS[self.args.board].arch]) ["target", "add", SUPPORTED_BOARDS[self.args.board].arch])
self.checked_command(rustup_target) self.checked_command(rustup_target)
@@ -368,7 +368,7 @@ class OpenSKInstaller:
if is_example: if is_example:
command.extend(["--example", self.args.application]) command.extend(["--example", self.args.application])
if self.args.verbose_build: if self.args.verbose_build:
command.extend("--verbose") command.extend(["--verbose"])
self.checked_command(command, env=env) self.checked_command(command, env=env)
app_path = os.path.join("target", props.arch, "release") app_path = os.path.join("target", props.arch, "release")
if is_example: if is_example:
@@ -406,7 +406,7 @@ class OpenSKInstaller:
"elf2tab", package_parameter, self.args.application, "-o", tab_filename "elf2tab", package_parameter, self.args.application, "-o", tab_filename
] ]
if self.args.verbose_build: if self.args.verbose_build:
elf2tab_args.extend("--verbose") elf2tab_args.extend(["--verbose"])
for arch, app_file in binaries.items(): for arch, app_file in binaries.items():
dest_file = os.path.join(self.tab_folder, "{}.elf".format(arch)) dest_file = os.path.join(self.tab_folder, "{}.elf".format(arch))
shutil.copyfile(app_file, dest_file) shutil.copyfile(app_file, dest_file)