diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-09 11:59:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-09 11:59:15 -0300 |
| commit | 8c70d56c5138c6455c8e718e644ffab506adc081 (patch) | |
| tree | 6117190833ed5a9c493995b44943abc68ef5488e /mailimport | |
| parent | 6d6a42d7314489a738b7a0d9d9ed7801de07476b (diff) | |
| download | mediapointer-dvb-s2-8c70d56c5138c6455c8e718e644ffab506adc081.tar.gz mediapointer-dvb-s2-8c70d56c5138c6455c8e718e644ffab506adc081.tar.bz2 | |
mailimport now accepts both kernel and v4l/dvb tree patches
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'mailimport')
| -rwxr-xr-x | mailimport | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mailimport b/mailimport index edbde0e06..1f6c15668 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 $pdif -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 } |