Bug 1055774: Update lookup for crashreporter.ini for the new v2 bundle structure on OSX. r=bsmedberg
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Fri, 12 Sep 2014 15:56:58 -0400
changeset 491214 c0753b4482fecda13f26ffd81f6a6ff78296d92d
parent 491213 b77a3ec4d737e945974318b46b07a3e9198b5360
child 491215 7c202d50b2fde97b69062644df313482a41499a6
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 = {