[LyX/master] Wininstaller, fix bug where previous installations, with emergency version greater than 1, could not be seen in registry on overinstall

[Richard Kimberly Heck]

On 7/7/20 3:55 PM, Yu Jin wrote:
> Am Di., 7. Juli 2020 um 21:29 Uhr schrieb Richard Kimberly Heck
> <rikiheck at lyx.org <mailto:rikiheck at lyx.org>>:
>
>     On 7/7/20 3:19 PM, Yu Jin wrote:
>>     Am Di., 7. Juli 2020 um 21:14 Uhr schrieb Eugene Chornyi
>>     <yu_jin at lyx.org <mailto:yu_jin at lyx.org>>:
>>
>>         commit 32e501a282a3c9e83181979c32bf9b9cde79e43f
>>         Author: Eugene Chornyi <yu_jin at lyx.org <mailto:yu_jin at lyx.org>>
>>         Date:   Tue Jul 7 21:13:34 2020 +0200
>>
>>             Wininstaller, fix bug where previous installations, with
>>         emergency version greater than 1, could not be seen in
>>         registry on overinstall
>>         ---
>>          .../Win32/packaging/installer/include/init.nsh     |    8
>>         ++++++--
>>          1 files changed, 6 insertions(+), 2 deletions(-)
>>
>>         diff --git
>>         a/development/Win32/packaging/installer/include/init.nsh
>>         b/development/Win32/packaging/installer/include/init.nsh
>>         index 76bacd5..bdbb495 100644
>>         --- a/development/Win32/packaging/installer/include/init.nsh
>>         +++ b/development/Win32/packaging/installer/include/init.nsh
>>         @@ -660,13 +660,17 @@ Function .onInit
>>              ReadRegStr $0 HKLM
>>         "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5"
>>         "DisplayVersion"
>>              # also check for an emergency release
>>              ${if} $0 == ""
>>         -     ReadRegStr $0 HKLM
>>         "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$51"
>>         "DisplayVersion"
>>         +     ${For} $7 0 20
>>         +      ReadRegStr $0 HKLM
>>         "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5$7"
>>         "DisplayVersion"
>>         +     ${Next}
>>              ${endif}
>>             ${else}
>>              ReadRegStr $0 HKCU
>>         "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5"
>>         "DisplayVersion"
>>              # also check for an emergency release
>>              ${if} $0 == ""
>>         -     ReadRegStr $0 HKCU
>>         "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$51"
>>         "DisplayVersion"
>>         +     ${For} $7 0 20
>>         +      ReadRegStr $0 HKCU
>>         "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}${APP_VERSION_MAJOR}${APP_VERSION_MINOR}$5$7"
>>         "DisplayVersion"
>>         +     ${Next}
>>              ${endif}
>>             ${endif}
>>             ${if} $0 != ""
>>         -- 
>>         lyx-cvs mailing list
>>         lyx-cvs at lists.lyx.org <mailto:lyx-cvs at lists.lyx.org>
>>         http://lists.lyx.org/mailman/listinfo/lyx-cvs
>>
>>
>>     This is the fix from the recent report in the devel ML. OK to
>>     commit to stable?
>
>     OK. Remember to add a note to status.23x.
>
> Done, I hope I did it right, but looks good.

Perfect!

Riki


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200708/f58ad0f3/attachment-0001.html>