EXE: Add additional clean-up of pkgs dir if needed (#1214)

* Add additional clean-up of pkgs dir if needed

* Add news

* Remove additional REBOOTOK RMDir

Co-authored-by: Marco Esters <mesters@anaconda.com>

* Update comment main.nsi.tmpl

---------

Co-authored-by: Marco Esters <mesters@anaconda.com>

Author: lrandersson

constructor/nsis/main.nsi.tmpl

@@ -1678,6 +1678,12 @@ Section "Install"
         push 'Failed to clear package cache'
         push 'WithLog'
         call AbortRetryNSExecWait
+        # conda clean may leave behind .conda_trash files or locked files (e.g. vc_runtime DLLs).
+        # Force remove any leftovers, note that locked files may still remain
+        # See https://github.com/conda/constructor/issues/1213
+        ${If} ${FileExists} "$INSTDIR\pkgs"
+            nsExec::Exec 'cmd.exe /D /C RMDIR /Q /S "$INSTDIR\pkgs"'
+        ${EndIf}
     ${EndIf}
 
     !if ${INIT_CONDA_OPTION} == 1

news/1214-improve-pkg-clean

@@ -0,0 +1,19 @@
+### Enhancements
+
+* EXE: Uninstalling with option "Clear Package Cache" now also performs additional clean-up to account for potentially left-over files. (#1213 via #1214)
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>