[Gpg4win-commits] r878 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-08-11 16:58:08 +0200 (Mon, 11 Aug 2008)
New Revision: 878

Modified:
   trunk/ChangeLog
   trunk/src/uninst-gnupg2.nsi
Log:
Make deinstallation a bit more robust.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-11 14:50:23 UTC (rev 877)
+++ trunk/ChangeLog	2008-08-11 14:58:08 UTC (rev 878)
@@ -1,3 +1,8 @@
+2008-08-11  Werner Koch  <wk at g10code.com>
+
+	* src/uninst-gnupg2.nsi: Do not run gpg-connect-agent unless all
+	required DLLs are still installed.
+
 2008-08-11  Marcus Brinkmann  <marcus at g10code.com>
 
 	* src/inst-sections.nsi: Reorder installation and uninstallation

Modified: trunk/src/uninst-gnupg2.nsi
===================================================================
--- trunk/src/uninst-gnupg2.nsi	2008-08-11 14:50:23 UTC (rev 877)
+++ trunk/src/uninst-gnupg2.nsi	2008-08-11 14:58:08 UTC (rev 878)
@@ -32,9 +32,11 @@
   Call un.SourceDelete
 !else
   # Try to stop a running agent.  This is only for the admin but in
-  # some cases that is actually useful
+  # some cases that is actually useful.
   ifFileExists "$INSTDIR\gpg-connect-agent.exe" 0 no_u_gpg_connect_agent
-    ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
+    ifFileExists "$INSTDIR\libgpg-error-0.dll" 0 no_u_gpg_connect_agent
+      ifFileExists "$INSTDIR\libw32pth-0.dll" 0 no_u_gpg_connect_agent
+        ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
   no_u_gpg_connect_agent:
 
   Delete "$INSTDIR\gpg2.exe"