commit 5630a27f53486655c14eae06276989f4e10632ef Author: Kathy Brade brade@pearlcrescent.com Date: Tue Oct 7 17:17:08 2014 -0400

Bug 13356: symlinks missing after complete update.

Include the symlink remove and add directives in the updatev2.manifest file that is used by 4.0-alpha-3 browsers (as well as in the updatev3.manifest file that is used by ESR31-based browsers). --- tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index ecdc5dd..7f93a21 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -115,9 +115,11 @@ make_add_if_not_instruction() { make_addsymlink_instruction() { link="$1" target="$2" - filev3="$3" + filev2="$3" + filev3="$4"

verbose_notice " addsymlink: $link -> $target" + echo "addsymlink "$link" "$target"" >> "$filev2" echo "addsymlink "$link" "$target"" >> "$filev3" }

diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 77c3de3..b5813f2 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -124,12 +124,12 @@ for ((i=0; $i<$num_files; i=$i+1)); do done

notice "" -notice "Adding symlink add instructions to file 'updatev3.manifest'" +notice "Adding symlink add instructions to update manifests" num_symlinks=${#symlinks[*]} for ((i=0; $i<$num_symlinks; i=$i+1)); do link="${symlinks[$i]}" target="${symlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done

# Append remove instructions for any dead files. diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index fb5313f..60c5a4b 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -249,11 +249,12 @@ done

# Remove and re-add symlinks notice "" -notice "Adding symlink remove/add instructions to file 'updatev3.manifest'" +notice "Adding symlink remove/add instructions to update manifests" num_oldsymlinks=${#oldsymlinks[*]} for ((i=0; $i<$num_oldsymlinks; i=$i+1)); do link="${oldsymlinks[$i]}" verbose_notice " remove: $link" + echo "remove "$link"" >> "$updatemanifestv2" echo "remove "$link"" >> "$updatemanifestv3" done

@@ -261,7 +262,7 @@ num_newsymlinks=${#newsymlinks[*]} for ((i=0; $i<$num_newsymlinks; i=$i+1)); do link="${newsymlinks[$i]}" target="${newsymlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done

# Newly added files