Bug 701193 - xpcshell-tests for add-on manager broken when update channel is set to aurora/beta/release; r=dtownsend

This commit is contained in:
Geoff Lankow 2011-11-10 12:08:48 +13:00
parent dd483e4921
commit 3034197062

View File

@ -47,6 +47,7 @@ Components.utils.import("resource://gre/modules/FileUtils.jsm");
Components.utils.import("resource://gre/modules/NetUtil.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/AddonManager.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
var EXPORTED_SYMBOLS = [ "AddonRepository" ];
@ -64,13 +65,14 @@ const PREF_CHECK_COMPATIBILITY_BASE = "extensions.checkCompatibility";
const BRANCH_REGEXP = /^([^\.]+\.[0-9]+[a-z]*).*/gi;
XPCOMUtils.defineLazyGetter(this, "PREF_CHECK_COMPATIBILITY", function () {
#ifdef MOZ_COMPATIBILITY_NIGHTLY
const PREF_CHECK_COMPATIBILITY = PREF_CHECK_COMPATIBILITY_BASE +
".nightly";
return PREF_CHECK_COMPATIBILITY_BASE + ".nightly";
#else
const PREF_CHECK_COMPATIBILITY = PREF_CHECK_COMPATIBILITY_BASE + "." +
Services.appinfo.version.replace(BRANCH_REGEXP, "$1");
return PREF_CHECK_COMPATIBILITY_BASE + "." +
Services.appinfo.version.replace(BRANCH_REGEXP, "$1");
#endif
});
const XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml";