[git] GnuPG - branch, master, updated. gnupg-2.1.16-149-g026bbf0

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  026bbf0d5ee4510967e5f1dd3db2dee4687b0612 (commit)
      from  e384405b6e251629fb36bcbba4f5f9ac15a39d10 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 026bbf0d5ee4510967e5f1dd3db2dee4687b0612
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Dec 19 15:10:44 2016 +0100

    speedo,w32: Use nsExec::ExecToLog to avoid popups
    
    * build-aux/speedo/w32/inst.nsi: Use ExecToLog instead of
    ExecWait.
    
    --
    nsExec is a standard nsis call to spawn a process and
    wait for it to finish. ExecToLog redirects stdout and stderr
    of the process call and adds it to the log window instead
    of opening a temporary console window.
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 24d5d4d..164e26b 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -545,15 +545,16 @@ Section "-gnupginst"
   # If we are reinstalling, try to kill a possible running gpa using
   # an already installed gpa.
   ifFileExists "$INSTDIR\bin\launch-gpa.exe"  0 no_uiserver
-    ExecWait '"$INSTDIR\bin\launch-gpa" --stop-server'
+    nsExec::ExecToLog '"$INSTDIR\bin\launch-gpa" "--stop-server"'
 
   no_uiserver:
 
   # If we are reinstalling, try to kill a possible running agent using
   # an already installed gpgconf.
+
   ifFileExists "$INSTDIR\bin\gpgconf.exe"  0 no_gpgconf
-    ExecWait '"$INSTDIR\bin\gpgconf" --kill dirmngr'
-    ExecWait '"$INSTDIR\bin\gpgconf" --kill gpg-agent'
+    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"'
+    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"'
 
   no_gpgconf:
 
@@ -976,7 +977,7 @@ ${If} ${RunningX64}
   # RegDLL can't be used for 64 bit and InstallLib seems to be a
   # registry hack.
   ClearErrors
-  ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgex6.dll"'
+  nsExec::ExecToLog '"$SYSDIR\regsvr32" "/s" "$INSTDIR\bin\gpgex6.dll"'
   ifErrors 0 +2
      MessageBox MB_OK "$(T_GPGEX_RegFailed) (64 bit)"
 
@@ -1007,11 +1008,11 @@ SectionEnd
 
 Section "-un.gnupglast"
   ifFileExists "$INSTDIR\bin\launch-gpa.exe"  0 no_uiserver
-    ExecWait '"$INSTDIR\bin\launch-gpa" --stop-server'
+    nsExec::ExecToLog '"$INSTDIR\bin\launch-gpa" "--stop-server"'
   no_uiserver:
   ifFileExists "$INSTDIR\bin\gpgconf.exe"  0 no_gpgconf
-    ExecWait '"$INSTDIR\bin\gpgconf" --kill gpg-agent'
-    ExecWait '"$INSTDIR\bin\gpgconf" --kill dirmngr'
+    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"'
+    nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"'
   no_gpgconf:
 SectionEnd
 
@@ -1021,7 +1022,7 @@ Section "-un.gpgex"
   Delete /REBOOTOK "$INSTDIR\bin\gpgex.dll"
 
 ${If} ${RunningX64}
-  ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgex6.dll"'
+  nsExec::ExecToLog '"$SYSDIR\regsvr32" "/u" "/s" "$INSTDIR\bin\gpgex6.dll"'
   Delete /REBOOTOK "$INSTDIR\bin\gpgex6.dll"
 ${EndIf}
 SectionEnd

-----------------------------------------------------------------------

Summary of changes:
 build-aux/speedo/w32/inst.nsi | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org