From a5a4e421208d610e48272df4836a65a1d33eae8b Mon Sep 17 00:00:00 2001
From: "nrthomas@gmail.com" <none@none>
Date: Wed, 22 Aug 2007 10:23:59 -0700
Subject: [PATCH] Bug 393036, re-unpack ab-CD.xpi when doing update
 verification with 1.5.0.x win32 installers, r=rhelmer

---
 testing/release/common/check_updates.sh | 5 +++--
 testing/release/common/unpack.sh        | 2 ++
 testing/release/updates/verify.sh       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/testing/release/common/check_updates.sh b/testing/release/common/check_updates.sh
index 4aaf5877254..d16dbf7a50b 100755
--- a/testing/release/common/check_updates.sh
+++ b/testing/release/common/check_updates.sh
@@ -3,17 +3,18 @@ check_updates () {
   update_platform=$1
   source_package=$2
   target_package=$3
+  locale=$4
 
   # cleanup
   rm -rf source/*
   rm -rf target/*
 
-  unpack_build $update_platform source "$source_package" 
+  unpack_build $update_platform source "$source_package" $locale
   if [ "$?" != "0" ]; then
     echo "FAILED: cannot unpack_build $update_platform source $source_package"
     return 1
   fi
-  unpack_build $update_platform target "$target_package" 
+  unpack_build $update_platform target "$target_package" $locale 
   if [ "$?" != "0" ]; then
     echo "FAILED: cannot unpack_build $update_platform target $target_package"
     return 1
diff --git a/testing/release/common/unpack.sh b/testing/release/common/unpack.sh
index d2994ea65af..3e54d0ad198 100755
--- a/testing/release/common/unpack.sh
+++ b/testing/release/common/unpack.sh
@@ -3,6 +3,7 @@ unpack_build () {
     unpack_platform="$1"
     dir_name="$2"
     pkg_file="$3"
+    locale=$4
 
     mkdir -p $dir_name
     pushd $dir_name > /dev/null
@@ -29,6 +30,7 @@ unpack_build () {
               do
                 unzip -o $file > /dev/null
               done
+              unzip -o ${locale}.xpi > /dev/null
             fi
             ;;
         linux-i686|linux|Linux_x86-gcc|Linux_x86-gcc3)
diff --git a/testing/release/updates/verify.sh b/testing/release/updates/verify.sh
index 9ffd63052b0..d7a38c26fee 100755
--- a/testing/release/updates/verify.sh
+++ b/testing/release/updates/verify.sh
@@ -128,7 +128,7 @@ do
         fi
         source_file=`basename "$from_path"`
         target_file=`basename "$to_path"`
-        check_updates "$platform" "downloads/$source_file" "downloads/$target_file"
+        check_updates "$platform" "downloads/$source_file" "downloads/$target_file" $locale
         err=$?
         if [ "$err" != "0" ]; then
           echo "WARN: check_update returned non-zero exit code for $platform downloads/$source_file vs. downloads/$target_file: $err"