Bug 1055774: Update lookup for crashreporter.ini for the new v2 bundle structure on OSX. r=bsmedberg
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Thu, 18 Sep 2014 16:22:41 -0400
changeset 491237 e16f85082398783258c871fe380efb5af8759f53
parent 491236 e67519887268a4777071d60e7dbf8f85f828269a
child 491238 f56689179777d8292cfb4acec247ec5ab88f1812
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
reviewersbsmedberg
bugs1055774
milestone35.0a1
Bug 1055774: Update lookup for crashreporter.ini for the new v2 bundle structure on OSX. r=bsmedberg
toolkit/crashreporter/CrashSubmit.jsm
--- a/toolkit/crashreporter/CrashSubmit.jsm
+++ b/toolkit/crashreporter/CrashSubmit.jsm
@@ -40,19 +40,21 @@ function parseINIStrings(file) {
 function getL10nStrings() {
   let dirSvc = Cc["@mozilla.org/file/directory_service;1"].
                getService(Ci.nsIProperties);
   let path = dirSvc.get("GreD", Ci.nsIFile);
   path.append("crashreporter.ini");
   if (!path.exists()) {
     // see if we're on a mac
     path = path.parent;
+    path = path.parent;
+    path.append("MacOS");
     path.append("crashreporter.app");
     path.append("Contents");
-    path.append("MacOS");
+    path.append("Resources");
     path.append("crashreporter.ini");
     if (!path.exists()) {
       // very bad, but I don't know how to recover
       return;
     }
   }
   let crstrings = parseINIStrings(path);
   strings = {