Skip to contentSkip to conversation

Fixed a bug with GUI icon not being deleted on upgrade from 2.2-RC or earlier

PATCH Superseded Samuli Seppänen 2 participants 3 messages Apr 15, 2011

lore
Share & tools
lore

Samuli Seppänen

author
#0 lore raw

PATCH 1/1 Fixed a bug with GUI icon not being deleted on upgrade from 2.2-RC or earlier

This bug was introduced in commit 110e42d199e735ab1a31388c5678f59d0fa9510c.

Trac-ticket: 120

Signed-off-by Samuli Seppänen <[email protected]...>
---
 win/openvpn.nsi |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
win/openvpn.nsi +7 -0
index bad1ef4..148dafc 100755
@@ -237,6 +237,13 @@ Section -pre
 
   Sleep 3000
 
+  # Fix for Trac ticket 120. Remove after 2.3 has been released.
+  !ifdef USE_GUI
+    SetShellVarContext current
+    Delete "$INSTDIR\bin\${OPENVPN_GUI}"
+    Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk"
+  !endif
+
 SectionEnd
 
 Section "${PRODUCT_NAME} User-Space Components" SecOpenVPNUserSpace
Signature · 1 line
1.6.3.3
author
#1 lore raw

PATCH v2 1/1 Fixed a bug with GUI icon deletion on upgrade from 2.2-RC or earlier

This bug was introduced in commit 110e42d199e735ab1a31388c5678f59d0fa9510c.

Trac-ticket: 120

Signed-off-by Samuli Seppänen <[email protected]...>
---
 win/openvpn.nsi |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
win/openvpn.nsi +6 -0
index bad1ef4..d3f80d0 100755
@@ -237,6 +237,12 @@ Section -pre
 
   Sleep 3000
 
+  # Fix for Trac ticket 120. Remove after 2.3 has been released.
+  !ifdef USE_GUI
+    SetShellVarContext current
+    Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk"
+  !endif
+
 SectionEnd
 
 Section "${PRODUCT_NAME} User-Space Components" SecOpenVPNUserSpace
Signature · 1 line
1.6.3.3
#2 lore raw

Re: [Openvpn-devel] [PATCHv2] Fixed a bug with GUI icon deletion on upgrade from 2.2-RC or earlier

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 4 lines · Samuli Seppänen

This bug was introduced in commit 110e42d199e735ab1a31388c5678f59d0fa9510c.

Trac-ticket: 120

Signed-off-by Samuli Seppänen <[email protected]...>

ACK. Applied to master and beta2.2

commit 1cc2b62d97d651ce9b05466928faba3b463838b7

Author: Samuli Seppänen <[email protected]...>
Date:   Fri Apr 15 16:25:17 2011 +0300
    Fixed a bug with GUI icon deletion on upgrade from 2.2-RC or earlier

    This bug was introduced in commit 110e42d199e735ab1a31388c5678f59d0fa9

    Trac-ticket: 120
    Signed-off-by: Samuli Seppänen <[email protected]...>
    Acked-by: David Sommerseth <[email protected]...>
    Signed-off-by: David Sommerseth <[email protected]...>
    (cherry picked from commit 6d1d08f6792109a4a4cdd9cd0936fd4338c76fa1)

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk2oUj4ACgkQDC186MBRfrpNtACfVtuKzYJ36/gx/irIYtFfruPb kVgAn2v3v3N/aJJDOj2crbwH3+mbF5UN
=/qmi
-----END PGP SIGNATURE-----