Bug 1165135 - Distribution directory not removed on pave over install. r=spohl, a=sledru
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 15 May 2015 10:36:09 -0700
changeset 267468 d314b3559a93f4e85aff65339d50b97c6d977d1e
parent 267467 740cf3ad1c52768f367134dd96de0dd593904a6b
child 267469 490bc4e9a9df75cafffd07781901330a779a8559
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl, sledru
bugs1165135
milestone39.0
Bug 1165135 - Distribution directory not removed on pave over install. r=spohl, a=sledru
browser/installer/windows/nsis/installer.nsi
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -199,16 +199,17 @@ ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\
 Section "-InstallStartCleanup"
   SetDetailsPrint both
   DetailPrint $(STATUS_CLEANUP)
   SetDetailsPrint none
 
   SetOutPath "$INSTDIR"
   ${StartInstallLog} "${BrandFullName}" "${AB_CD}" "${AppVersion}" "${GREVersion}"
 
+  StrCpy $R9 "true"
   StrCpy $PreventRebootRequired "false"
   ${GetParameters} $R8
   ${GetOptions} "$R8" "/INI=" $R7
   ${Unless} ${Errors}
     ; The configuration file must also exist
     ${If} ${FileExists} "$R7"
       ReadINIStr $R9 $R7 "Install" "RemoveDistributionDir"
       ReadINIStr $R8 $R7 "Install" "PreventRebootRequired"