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 260521 4bfd19d00ed4
parent 260520 6ec85b777880
child 260522 f9328a6ea6bd
push id805
push userryanvm@gmail.com
push date2015-05-18 17:06 +0000
treeherdermozilla-release@4bfd19d00ed4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl, sledru
bugs1165135
milestone38.0.5
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"