diff --git a/installation_and_upgrade/IBEX_upgrade.py b/installation_and_upgrade/IBEX_upgrade.py index 6e31309..f8bd9e7 100644 --- a/installation_and_upgrade/IBEX_upgrade.py +++ b/installation_and_upgrade/IBEX_upgrade.py @@ -7,7 +7,7 @@ import re import sys -import ibex_install_utils.default_args +import ibex_install_utils.current_args import semantic_version # pyright: ignore from ibex_install_utils.exceptions import ErrorInTask, UserStop from ibex_install_utils.file_utils import FileUtils @@ -110,7 +110,7 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str: parser.add_argument("--kits_icp_dir", default=None, help="Directory of kits/ICP") parser.add_argument( "--server_arch", - default=ibex_install_utils.default_args.SERVER_ARCH, + default=ibex_install_utils.current_args.SERVER_ARCH, choices=["x64", "x86"], help="Server build architecture.", ) @@ -126,7 +126,7 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str: args = parser.parse_args() - ibex_install_utils.default_args.SERVER_ARCH = args.server_arch + ibex_install_utils.current_args.SERVER_ARCH = args.server_arch if not args.no_log_to_var: Logger.set_up() diff --git a/installation_and_upgrade/ibex_install_utils/default_args.py b/installation_and_upgrade/ibex_install_utils/current_args.py similarity index 95% rename from installation_and_upgrade/ibex_install_utils/default_args.py rename to installation_and_upgrade/ibex_install_utils/current_args.py index 118fff8..bc28be5 100644 --- a/installation_and_upgrade/ibex_install_utils/default_args.py +++ b/installation_and_upgrade/ibex_install_utils/current_args.py @@ -1 +1 @@ -SERVER_ARCH = "x64" +SERVER_ARCH = "x64" diff --git a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py index 7210fea..7469a7f 100644 --- a/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py +++ b/installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py @@ -427,9 +427,9 @@ def install_or_upgrade_vc_redist(self) -> None: """ Install the latest visual studio redistributable files """ - import ibex_install_utils.default_args + import ibex_install_utils.current_args - arch = ibex_install_utils.default_args.SERVER_ARCH + arch = ibex_install_utils.current_args.SERVER_ARCH print(f"Installing vc_redist for arch: {arch}")