Bug 764684: Enable update staging for B2G, and skip the update.test check. r=ehsan

This commit is contained in:
Marshall Culpepper 2012-08-27 12:15:12 -03:00
parent 59e79c2dc1
commit 637c26363e
2 changed files with 10 additions and 1 deletions

View File

@ -444,6 +444,7 @@ pref("app.update.auto", true);
pref("app.update.silent", true);
pref("app.update.mode", 0);
pref("app.update.incompatible.mode", 0);
pref("app.update.stage.enabled", true);
pref("app.update.service.enabled", true);
// The URL hosting the update manifest.

View File

@ -77,6 +77,14 @@ const KEY_GRED = "GreD";
const KEY_UPDROOT = "UpdRootD";
#endif
#ifdef XP_WIN
#define SKIP_STAGE_UPDATES_TEST
#elifdef MOZ_WIDGET_GONK
// In Gonk, the updater will remount the /system partition to move staged files
// into place, so we skip the test here to keep things isolated.
#define SKIP_STAGE_UPDATES_TEST
#endif
const DIR_UPDATES = "updates";
#ifdef XP_MACOSX
const UPDATED_DIR = "Updated.app";
@ -443,7 +451,7 @@ XPCOMUtils.defineLazyGetter(this, "gCanStageUpdates", function aus_gCanStageUpda
return false;
}
#ifdef XP_WIN
#ifdef SKIP_STAGE_UPDATES_TEST
if (getPref("getBoolPref", PREF_APP_UPDATE_SERVICE_ENABLED, false)) {
// No need to perform directory write checks, the maintenance service will
// be able to write to all directories.