Bug 1063052 - In case a user ends up with unpacked chrome, on update use omni.ja again by removing chrome.manifest. r=rstrong, r=glandium, sr=dbaron, a=lmandel
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 17 Sep 2014 11:21:14 -0400
changeset 216791 2dce6525ddfe
parent 216790 b88069789828
child 216792 9f2dc7a2df34
push id3912
push userryanvm@gmail.com
push date2014-09-18 15:37 +0000
treeherdermozilla-beta@2dce6525ddfe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong, glandium, dbaron, lmandel
bugs1063052
milestone33.0
Bug 1063052 - In case a user ends up with unpacked chrome, on update use omni.ja again by removing chrome.manifest. r=rstrong, r=glandium, sr=dbaron, a=lmandel
browser/installer/removed-files.in
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -52,16 +52,23 @@
 #
 # Example: path/to/dir/*
 
 # File Removals
 # This is located under the "distribution/" directory and it was added before
 # Firefox 27
 distribution/extensions/testpilot@labs.mozilla.com.xpi
 
+# Some users are ending up with unpacked chrome instead of omni.ja. This
+# causes updates to break badly, see bug 1063052. Removing the toplevel
+# chrome.manifest causes us to use the updated omni.ja.
+#ifndef MOZ_GTK
+chrome.manifest
+#endif
+
 # Directory removals
 chrome/
 #ifdef XP_UNIX
   #ifndef XP_MACOSX
     chrome/icons/
     chrome/icons/default/
   #endif
 #endif