Backout 4b71e71c27a5 for removing update-settings.ini from installs
authorNick Thomas <nthomas@mozilla.com>
Mon, 20 Jan 2014 17:14:29 +1300
changeset 164259 57317659a609c199207c86c0415a554203586554
parent 164258 b56b70d548a215dadd3b2bd854225713deea10d5
child 164260 75059be6b15503cb4c09cf12c03c42516a56bba0
push id38658
push userMs2ger@gmail.com
push dateMon, 20 Jan 2014 08:36:21 +0000
treeherdermozilla-inbound@d86d7bf553c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
backs out4b71e71c27a5b0aa3245b7ad47feb7f5f6b795ec
first release with
nightly linux32
57317659a609 / 29.0a1 / 20140120030202 / files
nightly linux64
57317659a609 / 29.0a1 / 20140120030202 / files
nightly mac
57317659a609 / 29.0a1 / 20140120030202 / files
nightly win32
57317659a609 / 29.0a1 / 20140120030202 / files
nightly win64
57317659a609 / 29.0a1 / 20140120030202 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 4b71e71c27a5 for removing update-settings.ini from installs
tools/update-packaging/common.sh
--- a/tools/update-packaging/common.sh
+++ b/tools/update-packaging/common.sh
@@ -128,24 +128,23 @@ append_remove_instructions() {
         fi
       fi
     done
   fi
 }
 
 # List all files in the current directory, stripping leading "./"
 # Skip the channel-prefs.js file as it should not be included in any
-# generated MAR files (see bug 306077). Also update-settings.ini (bug 908134)
-# Pass a variable name and it will be filled as an array.
+# generated MAR files (see bug 306077). Pass a variable name and it will be
+# filled as an array.
 list_files() {
   count=0
 
   find . -type f \
     ! -name "channel-prefs.js" \
-    ! -name "update-settings.ini" \
     ! -name "update.manifest" \
     ! -name "updatev2.manifest" \
     ! -name "temp-dirlist" \
     ! -name "temp-filelist" \
     | sed 's/\.\/\(.*\)/\1/' \
     | sort -r > "temp-filelist"
   while read file; do
     eval "${1}[$count]=\"$file\""