nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset a4d8b4c3d321 (bug 1804303) as it is no longer necessary. r=bhearsum DONTBUILD

Browse source 
We needed one nightly build that updates channel-prefs.js.  Now that
it's done, and a watershed is in place, we can restore mar file
generation to its normal logic.

Differential Revision: https://phabricator.services.mozilla.com/D167036
This commit is contained in:
Julien Cristau 2023-01-17 15:40:12 +00:00
parent 4b07cd43d9
commit ae9dd1db3c
2 changed files with 1 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
tools/update-packaging/common.sh
View file

@ -92,10 +92,6 @@ make_add_instruction() {
check_for_add_if_not_update() { check_for_add_if_not_update() {
add_if_not_file_chk="$1" add_if_not_file_chk="$1"
# XXX unconditional add-if for channel-prefs.js to fix mac signature on old installs (bug 1804303)
if [ "$add_if_not_file_chk" = "Contents/Resources/defaults/pref/channel-prefs.js" ]; then
return 1
fi
if [ `basename $add_if_not_file_chk` = "channel-prefs.js" -o \ if [ `basename $add_if_not_file_chk` = "channel-prefs.js" -o \
`basename $add_if_not_file_chk` = "update-settings.ini" ]; then `basename $add_if_not_file_chk` = "update-settings.ini" ]; then
## "true" *giggle* ## "true" *giggle*

3
tools/update-packaging/make_incremental_update.sh
View file

@ -78,8 +78,7 @@ if [ $# = 0 ]; then
exit 1 exit 1
fi fi
# force update to channel-prefs.js for bug 1804303 requested_forced_updates='Contents/MacOS/firefox'
requested_forced_updates='Contents/MacOS/firefox Contents/Resources/defaults/pref/channel-prefs.js'
while getopts "hqf:" flag while getopts "hqf:" flag
do do