Skip to content

Commit a8345b0

Browse files
Created global for COMPUTERNAME from BaseTasks' get_machine_name() method
Co-authored-by: dtmaclaren <[email protected]>
1 parent f9b848d commit a8345b0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

installation_and_upgrade/ibex_install_utils/tasks/update_scripts.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
from ibex_install_utils.tasks.common_paths import SCRIPTS_BASE_DIR
77
from ibex_install_utils.user_prompt import UserPrompt
88

9+
COMPUTERNAME = BaseTasks._get_machine_name()
10+
911
class UpdateScripts(BaseTasks):
1012

1113
@task(f"Update scripts repo by merging master branch into instrument branch?")
1214
def update_scripts(self):
1315
try:
1416
subprocess.check_call(f"cd /d {SCRIPTS_BASE_DIR}", shell=True)
1517
git_instance = GitTasks(self.prompt,'','','','')
16-
git_instance.automatic_merge_of_git_remote("origin/master", f"%COMPUTERNAME%", SCRIPTS_BASE_DIR)
18+
git_instance.automatic_merge_of_git_remote("origin/master", COMPUTERNAME, SCRIPTS_BASE_DIR)
1719
except subprocess.CalledProcessError as e:
1820
print(f"{e}")
1921

0 commit comments

Comments
 (0)