Mac v2 signing - Bug 1055774 - Update lookup for crashreporter.ini for the new v2 bundle structure on OSX. r=bsmedberg
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Mon, 29 Sep 2014 11:51:13 -0700
changeset 207872 b503560736fac19cf1b9904674dfab17ba1650aa
parent 207871 0ce9e74b0abe5e7db9d7c31f65a4766db8ee5bff
child 207873 cbd3f8e4bf491ef6bd6dd4943df95b699594e741
push id27569
push usercbook@mozilla.com
push dateTue, 30 Sep 2014 13:14:19 +0000
treeherdermozilla-central@2ae57957e4bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1055774
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Mac v2 signing - 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 = {