send unquoted version too

conda · Sep 6, 2024 · 1a9029f · 1a9029f
1 parent 32563bf
commit 1a9029f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/constructor/nsis/main.nsi.tmpl b/constructor/nsis/main.nsi.tmpl
@@ -1205,9 +1205,9 @@ Section "Install"
     # https://github.com/conda/conda-libmamba-solver/issues/480
     System::Call 'kernel32::SetEnvironmentVariable(t,t)i("CONDA_SOLVER", "classic").r0'
     SetDetailsPrint TextOnly
-    ${Print} "Checking virtual specs compatibility: @VIRTUAL_SPECS@"
+    ${Print} "Checking virtual specs compatibility: @VIRTUAL_SPECS_DEBUG@"
     push '"$INSTDIR\_conda.exe" create --dry-run --prefix "$INSTDIR\envs\_virtual_specs_checks" --offline @VIRTUAL_SPECS@'
-    push 'Failed to check virtual specs: @VIRTUAL_SPECS@'
+    push 'Failed to check virtual specs: @VIRTUAL_SPECS_DEBUG@'
     push 'WithLog'
     call AbortRetryNSExecWait
     SetDetailsPrint both

diff --git a/constructor/winexe.py b/constructor/winexe.py
@@ -376,6 +376,8 @@ def make_nsi(
         ),
         ('@TEMP_EXTRA_FILES@', '\n    '.join(insert_tempfiles_commands(temp_extra_files))),
         ('@VIRTUAL_SPECS@', " ".join([f'"{spec}"' for spec in info.get("virtual_specs", ())])),
+        # This is the same but without quotes so we can print it fine
+        ('@VIRTUAL_SPECS_DEBUG@', " ".join([spec for spec in info.get("virtual_specs", ())])),
         ('@LICENSEFILENAME@', basename(info.get('license_file', 'placeholder_license.txt'))),
     ]:
         data = data.replace(key, value)