diff --git a/tools/update-verify/release/common/check_updates.sh b/tools/update-verify/release/common/check_updates.sh index 84b2ec70fb87..f03d8a069d6e 100644 --- a/tools/update-verify/release/common/check_updates.sh +++ b/tools/update-verify/release/common/check_updates.sh @@ -8,17 +8,15 @@ check_updates () { source_package=$2 target_package=$3 locale=$4 - # TODO: remove this unused var - use_old_updater=$5 - updater=$6 - diff_file=$7 - channel=$8 - mar_channel_IDs=$9 - update_to_dep=${10} + updater=$5 + diff_file=$6 + channel=$7 + mar_channel_IDs=$8 + update_to_dep=$9 local mac_update_settings_dir_override - mac_update_settings_dir_override=${11} + mac_update_settings_dir_override=${10} local product - product=${12} + product=${11} # cleanup rm -rf source/* diff --git a/tools/update-verify/release/common/download_mars.sh b/tools/update-verify/release/common/download_mars.sh index 5682e27ee3fd..d254e5db0c8d 100644 --- a/tools/update-verify/release/common/download_mars.sh +++ b/tools/update-verify/release/common/download_mars.sh @@ -39,7 +39,8 @@ download_mars () { command=$(echo "$update_line" | sed -e 's/^.*.*$::' -e 's:\&:\&:g') eval "export $command" - # TODO: fix all these undefined vars + # TODO: fix all these undefined vars, or maybe we should just ignore them and accept + # the magic? if [ -n "$to_build_id" ] && [ "$buildID" != "$to_build_id" ]; then echo "TEST-UNEXPECTED-FAIL: expected buildID $to_build_id does not match actual $buildID" return 1 diff --git a/tools/update-verify/release/updates/verify.sh b/tools/update-verify/release/updates/verify.sh index bbaaf5a14f64..4f7201c0482e 100755 --- a/tools/update-verify/release/updates/verify.sh +++ b/tools/update-verify/release/updates/verify.sh @@ -111,23 +111,11 @@ do channel="" from="" patch_types="complete" - use_old_updater=0 mar_channel_IDs="" updater_package="" mac_update_settings_dir_override="" eval "$entry" - # the arguments for updater changed in Gecko 34/SeaMonkey 2.31 - major_version=$(echo "$release" | cut -f1 -d.) - if [[ "$product" == "seamonkey" ]]; then - minor_version=$(echo "$release" | cut -f2 -d.) - if [[ $major_version -le 2 && $minor_version -lt 31 ]]; then - use_old_updater=1 - fi - elif [[ $major_version -lt 34 ]]; then - use_old_updater=1 - fi - # Note: cross platform tests seem to work for everything except Mac-on-Windows. # We probably don't care about this use case. if [[ "$updater_package" == "" ]]; then @@ -278,7 +266,7 @@ do if [ -e ${diff_file} ]; then rm ${diff_file} fi - check_updates "${platform}" "downloads/${source_file}" "downloads/${target_file}" "${locale}" "${use_old_updater}" "${updater}" ${diff_file} "${channel}" "${mar_channel_IDs}" ${update_to_dep} "${mac_update_settings_dir_override}" "${product}" + check_updates "${platform}" "downloads/${source_file}" "downloads/${target_file}" "${locale}" "${updater}" ${diff_file} "${channel}" "${mar_channel_IDs}" ${update_to_dep} "${mac_update_settings_dir_override}" "${product}" err=$? if [ "$err" == "0" ]; then continue