From 97a3e8770f7de5458cc762a31cf131640b64528e Mon Sep 17 00:00:00 2001 From: Benjamin Auquite Date: Sat, 24 Feb 2024 01:38:50 -0600 Subject: [PATCH] fix merge conflict [skip-edge] --- compile/deps_batchpatcher.ps1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/compile/deps_batchpatcher.ps1 b/compile/deps_batchpatcher.ps1 index d5b1749b0..983143690 100644 --- a/compile/deps_batchpatcher.ps1 +++ b/compile/deps_batchpatcher.ps1 @@ -14,11 +14,6 @@ $this_noprompt_arg = if ($this_noprompt) {'-noprompt'} else {''} $venv_name_arg = if ($venv_name) {"-venv_name $venv_name"} else {''} . $rootPath/install_python_venv.ps1 $this_noprompt_arg $venv_name_arg -Write-Host "Initializing python virtual environment..." -$this_noprompt_arg = if ($this_noprompt) {'-noprompt'} else {''} -$venv_name_arg = if ($venv_name) {"-venv_name $venv_name"} else {''} -. $rootPath/install_python_venv.ps1 $this_noprompt_arg $venv_name_arg - $output = & $pythonExePath -c "import tkinter; print('Tkinter is available')" 2>&1 if ($output -match "ModuleNotFoundError" -or $output -is [System.Management.Automation.ErrorRecord]) { Write-Host "Tkinter is not available for $($pythonExePath)"