merge: http://linuxtv.org/hg/~mkrufky/tuner

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 14 insertions, 6 deletions

diff --git a/mailimport b/mailimport
index 8ed624179..0050a1ded 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,28 +130,36 @@ apply_patch () {
 		hg addremove `diffstat -p1 -l $next`
 		if [ "$?" != "0" ]; then
 			echo "*** ERROR at hg addremove"
-			exit
+			echo hg addremove `diffstat -p1 -l $next`
+			patch -s -t -p1 -l -R -d $pdir -i $next
+			exit -1
 		fi
 
 		# Commit the changed files
 		CARDLIST="`hg status -n -m|grep CARDLIST.`"
 		FILES=""
+		for i in $CARDLIST; do
+			FILES="$FILES $cur/$i"
+		done
 		for i in `diffstat -p1 -l $next`; do
 			FILES="$FILES `pwd`/$i"
 		done
 
 		if [ "$FILES" == "" ]; then
 			echo "*** ERROR nothing to commit"
+			patch -s -t -p1 -l -R -d $pdir -i $next
 			cd $cur
-			exit
+			exit -1
 		fi
 
-		hg commit -d "$date" -u "$committer" -m "`cat $TMP2|grep -v "^#"`" $CARDLIST $FILES
+		hg commit -d "$date" -u "$committer" -m "`cat $TMP2|grep -v "^#"`" $FILES
 
 		if [ "$?" != "0" ]; then
 			echo "*** ERROR at hg commit"
+			echo hg commit -d \"$date\" -u \"$committer\" -m "<msg>" $FILES
+			patch -s -t -p1 -l -R -d $pdir -i $next
 			cd $cur
-			exit
+			exit -1
 		fi
 		cd $cur
 	fi
@@ -250,7 +258,7 @@ DIR="$TMPDIR/mailimport$$"
 mkdir $DIR
 if [ "$?" != "0" ]; then
 	echo "*** Error at mkdir $DIR"
-	exit;
+	exit -1;
 fi
 trap "rm -rf $DIR" EXIT