summaryrefslogtreecommitdiff
path: root/mailimport
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-03-10 14:03:11 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-03-10 14:03:11 -0300
commitb1d9bdd768643dbb593d8ba0d18a0dcd9be28a29 (patch)
tree9788051c6975bd71f482e3d586555239ea0251a4 /mailimport
parente1ac1610f46fa4ee30145bd37977fbed6129588f (diff)
downloadmediapointer-dvb-s2-b1d9bdd768643dbb593d8ba0d18a0dcd9be28a29.tar.gz
mediapointer-dvb-s2-b1d9bdd768643dbb593d8ba0d18a0dcd9be28a29.tar.bz2
Now, Mailimport tests also v4l/dvb patch structure
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'mailimport')
-rwxr-xr-xmailimport18
1 files changed, 12 insertions, 6 deletions
diff --git a/mailimport b/mailimport
index edbde0e06..6b3ff47cc 100755
--- a/mailimport
+++ b/mailimport
@@ -33,13 +33,19 @@ TMP2=$DIR/patchheader
apply_patch () {
next=$1
+ pdir=linux
- echo patch -s -t -p1 --dry-run -l -N -d linux -i $next
- patch -s -t -p1 --dry-run -l -N -d linux -i $next
+ echo patch -s -t -p1 --dry-run -l -N -d $pdir -i $next
+ patch -s -t -p1 --dry-run -l -N -d $pdir -i $next
if [ "$?" != "0" ]; then
- $head $next
- echo "*** ERROR"
- exit
+ pdir=.
+ echo patch -s -t -p1 --dry-run -l -N -d $pdir -i $next
+ patch -s -t -p1 --dry-run -l -N -d $pdir -i $next
+ if [ "$?" != "0" ]; then
+ $head $next
+ echo "*** ERROR"
+ exit
+ fi
fi
nano $next
@@ -84,7 +90,7 @@ apply_patch () {
echo hg -m "`cat $TMP2|grep -v "^#"`" qnew $name
hg qnew -m "`cat $TMP2|grep -v "^#"`" $name
- patch -s -t -p1 -l -N -d linux -i $next
+ patch -s -t -p1 -l -N -d $pdir -i $next
hg qrefresh
}