[tor-commits] [tor-browser/tor-browser-38.3.0esr-5.5-2] Revert "Back out changes for bug 16909"

[gk@xxxxxxxxxxxxxx]

commit 6b8cc11e03d53a1e31b7b3d587f8a567ce360251
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Tue Oct 13 08:35:06 2015 +0000

    Revert "Back out changes for bug 16909"
    
    This reverts commit fc16b4e722d7a956563eb6c008f9b88f5aef8434.
---
 tools/update-packaging/make_full_update.sh        |    5 ++++-
 tools/update-packaging/make_incremental_update.sh |   13 ++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh
index 62baf4c..3578ae4 100755
--- a/tools/update-packaging/make_full_update.sh
+++ b/tools/update-packaging/make_full_update.sh
@@ -11,7 +11,10 @@
 . $(dirname "$0")/common.sh
 
 # TODO: it would be better to pass this as a command line option.
-directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxx'
+# Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it
+# exists. The extension ID got changed with the version bump to 5.1.0.
+ext_path='TorBrowser/Data/Browser/profile.default/extensions'
+directories_to_remove="$ext_path/https-everywhere@xxxxxxx $ext_path/https-everywhere-eff@xxxxxxx"
 
 # -----------------------------------------------------------------------------
 
diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh
index 0e1e3f6..c803809 100755
--- a/tools/update-packaging/make_incremental_update.sh
+++ b/tools/update-packaging/make_incremental_update.sh
@@ -64,7 +64,8 @@ check_for_forced_update() {
     fi
 
     # If the file in the skip list ends with /*, do a prefix match.
-    # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxx/* to be used to force all HTTPS Everywhere files to be updated.
+    # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@xxxxxxx/*
+    # to be used to force all HTTPS Everywhere files to be updated.
     f_suffix=${f##*/}
     if [[ $f_suffix = "*" ]]; then
       f_prefix="${f%\/\*}";
@@ -122,7 +123,7 @@ archivefiles="updatev2.manifest updatev3.manifest"
 # If the NoScript or HTTPS Everywhere extensions have changed between
 # releases, add them to the "force updates" list.
 ext_path='TorBrowser/Data/Browser/profile.default/extensions'
-https_everywhere='https-everywhere@xxxxxxx'
+https_everywhere='https-everywhere-eff@xxxxxxx'
 noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi'
 
 # NoScript is a packed extension, so we simply compare the old and the new
@@ -144,12 +145,14 @@ https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf"
 diff "$olddir/$https_everywhere_install_rdf"     \
       "$newdir/$https_everywhere_install_rdf" > /dev/null
 rc=$?
-if [ $rc -gt 1 ]; then
+if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then
   notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command"
   exit 2
-elif [ $rc -eq 1 ]; then
+elif [ $rc -ge 1 ]; then
   requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*"
-  directories_to_remove="$directories_to_remove $ext_path/$https_everywhere"
+  # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it
+  # exists. The extension ID got changed with the version bump to 5.1.0.
+  directories_to_remove="$directories_to_remove $ext_path/https-everywhere@xxxxxxx $ext_path/$https_everywhere"
 fi
 
 mkdir -p "$workdir"

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits