Skip to content

Commit 2648eed

Browse files
committed
install vs redist on instrument deploy
1 parent dd02a68 commit 2648eed

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,17 +425,18 @@ def install_or_upgrade_vc_redist(self):
425425
)
426426
admin_commands.run_all()
427427

428+
print("waiting for install to finish")
428429
# vc_redist helpfully finishes with errorlevel 0 before actually copying the files over.
429430
# therefore we'll sleep for 5 seconds here
430431
sleep(5)
431432

432433
with open(log_file, "r") as f:
433-
last_line = f.readlines()[-1]
434+
for line in f.readlines():
435+
print("vc_redist install output: {}".format(line.rstrip()))
434436

435-
if "Exit code: 0x0" not in last_line:
436-
self.prompt.prompt_and_raise_if_not_yes(
437-
"Press Y/N if Git has installed correctly", default="Y"
438-
)
437+
self.prompt.prompt_and_raise_if_not_yes(
438+
"Installing vc redistributable files finished. Please check log output above for errors.", default="Y"
439+
)
439440
else:
440441
self.prompt.prompt_and_raise_if_not_yes(
441442
f"VC redistributable files not found in {exe_file.parent}, please check and make sure {exe_file} is present. "

0 commit comments

Comments
 (0)