Mac v2 signing - Bug 1071465 - old precomplete file is not removed on update. r=spohl

Author: Robert Strong

browser/installer/removed-files.in

@@ -81,7 +81,6 @@
 
 # Mac OS X v2 signing removals
 #ifdef XP_MACOSX
-  precomplete
   @DIR_MACOS@active-update.xml
   @DIR_MACOS@update-settings.ini
   @DIR_MACOS@updates.xml

toolkit/mozapps/update/updater/updater.cpp

@@ -3014,10 +3014,16 @@ int NS_main(int argc, NS_tchar **argv)
 #endif
 
 #ifdef XP_MACOSX
-  // When the update is successful move the distribution directory from
+  // When the update is successful remove the precomplete file in the root of
+  // the application bundle and move the distribution directory from
   // Contents/MacOS to Contents/Resources and if both exist delete the
   // directory under Contents/MacOS (see Bug 1068439).
-  if (gSucceeded) {
+  if (gSucceeded && !sStagedUpdate) {
+    NS_tchar oldPrecomplete[MAXPATHLEN];
+    NS_tsnprintf(oldPrecomplete, sizeof(oldPrecomplete)/sizeof(oldPrecomplete[0]),
+                 NS_T("%s/precomplete"), gInstallDirPath);
+    NS_tremove(oldPrecomplete);
+
     NS_tchar oldDistDir[MAXPATHLEN];
     NS_tsnprintf(oldDistDir, sizeof(oldDistDir)/sizeof(oldDistDir[0]),
                  NS_T("%s/Contents/MacOS/distribution"), gInstallDirPath);