Followup to Bug 392150 - Clean the old updates directory on uninstall / in-place upgrade. r=sspitzer, approval1.9b5=dsicore

browser/installer/windows/nsis/installer.nsi

@@ -112,6 +112,7 @@ VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
 !insertmacro AddDDEHandlerValues
 !insertmacro ChangeMUIHeaderImage
 !insertmacro CheckForFilesInUse
+!insertmacro CleanUpdatesDir
 !insertmacro CloseApp
 !insertmacro CopyFilesFromDir
 !insertmacro CreateRegKey
@@ -255,6 +256,9 @@ Section "-InstallStartCleanup"
     ${EndIf}
   ${EndIf}
 
+  ; Remove the updates directory for Vista and above
+  ${CleanUpdatesDir} "Mozilla\Firefox"
+
   ${InstallStartCleanupCommon}
 SectionEnd
 

toolkit/mozapps/installer/windows/nsis/common.nsh

@@ -4845,7 +4845,6 @@
 !macro InstallStartCleanupCommon
 
   !ifndef InstallStartCleanupCommon
-    !insertmacro CleanUpdatesDir
     !insertmacro CleanVirtualStore
     !insertmacro EndUninstallLog
     !insertmacro ParseRemovedFilesLog
@@ -4865,9 +4864,6 @@
       Delete "$INSTDIR\updates.xml"
       Delete "$INSTDIR\active-update.xml"
 
-      ; Remove the updates directory for Vista and above
-      ${CleanUpdatesDir} "Mozilla\Firefox"
-
       RmDir /r "$INSTDIR\distribution"
 
       ; Remove files from the uninstall directory.