bug 1255245: ESR45 generates mar files with the wrong channel ID: Always modify update-settings.ini. r=bhearsum a=rkent THUNDERBIRD470b2_2016061601_RELBRANCH THUNDERBIRD_47_0b2_BUILD1 THUNDERBIRD_47_0b2_RELEASE
authorNick Thomas <nthomas@mozilla.com>
Wed, 16 Mar 2016 08:42:37 -0400
branchTHUNDERBIRD470b2_2016061601_RELBRANCH
changeset 333329 77c04596623e6a766d30421cc8c20101a18731a7
parent 324881 f2ec5ebc83b3095be413103699271983993b404a
child 333330 8aaf62bd9c037b23aa1d9a4e68cd5dfdd210a0a2
push id6066
push userkent@caspia.com
push dateThu, 16 Jun 2016 22:00:38 +0000
treeherdermozilla-beta@77c04596623e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum, rkent
bugs1255245
milestone47.0
bug 1255245: ESR45 generates mar files with the wrong channel ID: Always modify update-settings.ini. r=bhearsum a=rkent
tools/update-packaging/common.sh
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -71,32 +71,25 @@ make_add_instruction() {
       echo "add \"$f\"" >> $filev3
     fi
   fi
 }
 
 check_for_add_if_not_update() {
   add_if_not_file_chk="$1"
 
-  if [ `basename $add_if_not_file_chk` = "channel-prefs.js" -o \
-       `basename $add_if_not_file_chk` = "update-settings.ini" ]; then
+  if [ `basename $add_if_not_file_chk` = "channel-prefs.js" ]; then
     ## "true" *giggle*
     return 0;
   fi
   ## 'false'... because this is bash. Oh yay!
   return 1;
 }
 
 check_for_add_to_manifestv2() {
-  add_if_not_file_chk="$1"
-
-  if [ `basename $add_if_not_file_chk` = "update-settings.ini" ]; then
-    ## "true" *giggle*
-    return 0;
-  fi
   ## 'false'... because this is bash. Oh yay!
   return 1;
 }
 
 make_add_if_not_instruction() {
   f="$1"
   filev3="$2"