Commit 43092f83 authored by Nick Thomas's avatar Nick Thomas
Browse files

Bug 908134, exclude update-settings.ini from mar files, r=bhearsum DONTBUILD

parent f648cb0f

tools/update-packaging/common.sh

+3 −2
Original line number Diff line number Diff line
@@ -133,13 +133,14 @@ append_remove_instructions() { 


# 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). Pass a variable name and it will be

# filled as an array.

# generated MAR files (see bug 306077). Also update-settings.ini (bug 908134)

# 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" \