Fix bug with channel checks not being used because of not found updater-settings.ini
authorBrian R. Bondy <netzen@gmail.com>
Wed, 19 Nov 2014 01:06:58 -0500
changeset 491353 dfdeaab30aca5d2c7a326d2414ccd41abd76d70c
parent 491352 6d28965c826b540f3759f384050ccd52d190000d
child 491354 be96efd87fcbbb3225f0feb7ad60517b763439a8
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone36.0a1
Fix bug with channel checks not being used because of not found updater-settings.ini
toolkit/mozapps/update/updater/updater.cpp
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -2142,17 +2142,22 @@ UpdateThreadFunc(void *param)
       rv = gArchiveReader.VerifySignature();
     }
 
     if (rv == OK) {
       if (rv == OK) {
         NS_tchar updateSettingsPath[MAX_TEXT_LEN];
         NS_tsnprintf(updateSettingsPath,
                      sizeof(updateSettingsPath) / sizeof(updateSettingsPath[0]),
-                     NS_T("%s/update-settings.ini"), gWorkingDirPath);
+#ifdef XP_MACOSX
+                     NS_T("%s/Contents/Resources/update-settings.ini"),
+#else
+                     NS_T("%s/update-settings.ini"),
+#endif
+                     gWorkingDirPath);
         MARChannelStringTable MARStrings;
         if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK) {
           // If we can't read from update-settings.ini then we shouldn't impose
           // a MAR restriction.  Some installations won't even include this file.
           MARStrings.MARChannelID[0] = '\0';
         }
 
         rv = gArchiveReader.VerifyProductInformation(MARStrings.MARChannelID,