diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /toolkit/mozapps/update/tests/data/shared.js | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/mozapps/update/tests/data/shared.js')
| -rw-r--r-- | toolkit/mozapps/update/tests/data/shared.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/toolkit/mozapps/update/tests/data/shared.js b/toolkit/mozapps/update/tests/data/shared.js index 60de6feeb8..e8553f7273 100644 --- a/toolkit/mozapps/update/tests/data/shared.js +++ b/toolkit/mozapps/update/tests/data/shared.js @@ -71,17 +71,20 @@ const FILE_ACTIVE_UPDATE_XML = "active-update.xml"; const FILE_ACTIVE_UPDATE_XML_TMP = "active-update.xml.tmp"; const FILE_APPLICATION_INI = "application.ini"; const FILE_BACKUP_UPDATE_CONFIG_JSON = "backup-update-config.json"; -const FILE_BACKUP_UPDATE_LOG = "backup-update.log"; const FILE_BACKUP_UPDATE_ELEVATED_LOG = "backup-update-elevated.log"; +const FILE_BACKUP_UPDATE_LOG = "backup-update.log"; const FILE_BT_RESULT = "bt.result"; -const FILE_LAST_UPDATE_LOG = "last-update.log"; +const FILE_CHANNEL_PREFS = + AppConstants.platform == "macosx" ? "ChannelPrefs" : "channel-prefs.js"; const FILE_LAST_UPDATE_ELEVATED_LOG = "last-update-elevated.log"; +const FILE_LAST_UPDATE_LOG = "last-update.log"; const FILE_PRECOMPLETE = "precomplete"; const FILE_PRECOMPLETE_BAK = "precomplete.bak"; const FILE_UPDATE_CONFIG_JSON = "update-config.json"; -const FILE_UPDATE_LOG = "update.log"; const FILE_UPDATE_ELEVATED_LOG = "update-elevated.log"; +const FILE_UPDATE_LOG = "update.log"; const FILE_UPDATE_MAR = "update.mar"; +const FILE_UPDATE_SETTINGS_FRAMEWORK = "UpdateSettings"; const FILE_UPDATE_SETTINGS_INI = "update-settings.ini"; const FILE_UPDATE_SETTINGS_INI_BAK = "update-settings.ini.bak"; const FILE_UPDATE_STATUS = "update.status"; @@ -223,6 +226,7 @@ function setUpdateChannel(aChannel) { debugDump( "setting default pref " + PREF_APP_UPDATE_CHANNEL + " to " + gChannel ); + gDefaultPrefBranch.unlockPref(PREF_APP_UPDATE_CHANNEL); gDefaultPrefBranch.setCharPref(PREF_APP_UPDATE_CHANNEL, gChannel); gPrefRoot.addObserver(PREF_APP_UPDATE_CHANNEL, observer); } |