Skip to content

Commit 0bc913f

Browse files
authored
Merge pull request #232 from ISISComputingGroup/Ticket8597
Ticket 8597
2 parents d55318b + 741c103 commit 0bc913f

File tree

2 files changed

+5
-30
lines changed

2 files changed

+5
-30
lines changed

installation_and_upgrade/ibex_install_utils/admin_runner.py

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,11 @@
88
class AdminRunner:
99
@staticmethod
1010
def run_command(command: str, parameters: str, expected_return_val: int | None = 0) -> None:
11-
try:
12-
import win32api
13-
import win32con
14-
import win32event
15-
import win32process
16-
from win32com.shell import shellcon
17-
from win32com.shell.shell import ShellExecuteEx
18-
except ImportError:
19-
raise OSError("Can only elevate privileges on windows")
20-
21-
print(f"Running command: '{command} {parameters}' as administrator")
22-
23-
process_info = ShellExecuteEx(
24-
nShow=win32con.SW_HIDE,
25-
fMask=shellcon.SEE_MASK_NOCLOSEPROCESS,
26-
lpVerb="runas",
27-
lpFile=command,
28-
lpParameters=parameters,
11+
input(
12+
f"Manually run command: '{command} {parameters}' as administrator. "
13+
f"Press enter to confirm command listed above ran successfully in an admin prompt. "
14+
f"It should exit with status code {expected_return_val}"
2915
)
30-
ret = None
31-
try:
32-
win32event.WaitForSingleObject(process_info["hProcess"], 600000)
33-
ret = win32process.GetExitCodeProcess(process_info["hProcess"])
34-
win32api.CloseHandle(process_info["hProcess"])
35-
except Exception as e:
36-
print(e)
37-
raise IOError("Process not created")
38-
39-
if ret != expected_return_val:
40-
raise IOError(f"Process returned {ret} (expected {expected_return_val})")
4116

4217

4318
class AdminCommandBuilder:

installation_and_upgrade/ibex_install_utils/tasks/mysql_tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
MYSQL8_INSTALL_DIR = os.path.join(APPS_BASE_DIR, "MySQL")
3434
MYSQL57_INSTALL_DIR = os.path.join("C:\\", "Program Files", "MySQL", "MySQL Server 5.7")
35-
MYSQL_LATEST_VERSION = "8.4.2"
35+
MYSQL_LATEST_VERSION = "8.4.5"
3636
MYSQL_ZIP = os.path.join(
3737
INST_SHARE_AREA,
3838
"kits$",

0 commit comments

Comments
 (0)