summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmailimport10
1 files changed, 6 insertions, 4 deletions
diff --git a/mailimport b/mailimport
index 8ed624179..94f0d53c4 100755
--- a/mailimport
+++ b/mailimport
@@ -120,7 +120,7 @@ apply_patch () {
patch -s -t -p1 -l -N -d $pdir -i $next
if [ "$?" != "0" ]; then
echo "*** ERROR at: patch -s -t -p1 -l -N -d $pdir -i $next"
- exit
+ exit -1
fi
make cardlist
make whitespace
@@ -130,7 +130,8 @@ apply_patch () {
hg addremove `diffstat -p1 -l $next`
if [ "$?" != "0" ]; then
echo "*** ERROR at hg addremove"
- exit
+ echo hg addremove `diffstat -p1 -l $next`
+ exit -1
fi
# Commit the changed files
@@ -150,8 +151,9 @@ apply_patch () {
if [ "$?" != "0" ]; then
echo "*** ERROR at hg commit"
+ echo hg commit -d \"$date\" -u \"$committer\" -m "<msg>" $CARDLIST $FILES
cd $cur
- exit
+ exit -1
fi
cd $cur
fi
@@ -250,7 +252,7 @@ DIR="$TMPDIR/mailimport$$"
mkdir $DIR
if [ "$?" != "0" ]; then
echo "*** Error at mkdir $DIR"
- exit;
+ exit -1;
fi
trap "rm -rf $DIR" EXIT