From 628e9a74eed4f10d2c6636054cca972d9bf60491 Mon Sep 17 00:00:00 2001
From: "mark%moxienet.com"
 <mark%moxienet.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 24 Feb 2006 18:16:33 +0000
Subject: [PATCH] 328403 Update (.mar) packaging should fail if the stuff to
 package is missing.  r=darin

git-svn-id: svn://10.0.0.236/trunk@191166 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../update-packaging/make_full_update.sh      |  9 ++++++++-
 .../make_incremental_update.sh                | 19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/mozilla/tools/update-packaging/make_full_update.sh b/mozilla/tools/update-packaging/make_full_update.sh
index afc9774c2ed..97749b50568 100755
--- a/mozilla/tools/update-packaging/make_full_update.sh
+++ b/mozilla/tools/update-packaging/make_full_update.sh
@@ -37,9 +37,16 @@ manifest="$workdir/update.manifest"
 targetfiles="update.manifest"
 
 # Generate a list of all files in the target directory.
-list=$(cd "$targetdir" && list_files)
+pushd "$targetdir"
+if test $? -ne 0 ; then
+  exit 1
+fi
+
+list=$(list_files)
 eval "files=($list)"
 
+popd
+
 mkdir -p "$workdir"
 > $manifest
 
diff --git a/mozilla/tools/update-packaging/make_incremental_update.sh b/mozilla/tools/update-packaging/make_incremental_update.sh
index d00db6cddcc..80e0d1ef118 100755
--- a/mozilla/tools/update-packaging/make_incremental_update.sh
+++ b/mozilla/tools/update-packaging/make_incremental_update.sh
@@ -71,11 +71,26 @@ manifest="$workdir/update.manifest"
 archivefiles="update.manifest"
 
 # Generate a list of all files in the target directory.
-list=$(cd "$olddir" && list_files)
+pushd "$olddir"
+if test $? -ne 0 ; then
+  exit 1
+fi
+
+list=$(list_files)
 eval "oldfiles=($list)"
-list=$(cd "$newdir" && list_files)
+
+popd
+
+pushd "$newdir"
+if test $? -ne 0 ; then
+  exit 1
+fi
+
+list=$(list_files)
 eval "newfiles=($list)"
 
+popd
+
 mkdir -p "$workdir"
 > $manifest