diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-15 16:19:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-15 16:19:13 -0300 |
| commit | 5f5b1f7caac900981d312440329164206a88750e (patch) | |
| tree | 354fa62c7091a347438de8a7335058c59539242c /mailimport | |
| parent | b8ebe646df7b497901331b89d74eaaa7de74e9ed (diff) | |
| download | mediapointer-dvb-s2-5f5b1f7caac900981d312440329164206a88750e.tar.gz mediapointer-dvb-s2-5f5b1f7caac900981d312440329164206a88750e.tar.bz2 | |
Mailimport now loops until patch is ok
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'mailimport')
| -rwxr-xr-x | mailimport | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/mailimport b/mailimport index b563eecd9..e6e4df411 100755 --- a/mailimport +++ b/mailimport @@ -28,6 +28,10 @@ if [ "$TMPDIR" == "" ]; then TMPDIR=/tmp fi +if [ "$EDITOR" == "" ]; then + EDITOR=nano +fi + DIR=$TMPDIR/mailimport$$ mkdir $DIR if [ "$?" != "0" ]; then @@ -39,26 +43,35 @@ TMP2=$DIR/patchheader apply_patch () { next=$1 - pdir=linux - 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 - pdir=. + unset cont + until [ "$cont" == "0" ]; do + cont=1 + pdir=linux 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 + 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 + fi + + if [ "$?" != "0" ]; then echo "*** ERROR: Patch didn't applied well" if [ "$exitonerror" != "" ]; then + $head $next exit - else - return fi + echo "** Edit file $next" + sleep 1 + $EDITOR $next + else + echo "Patch applied OK against $pdir" + cont=0 fi - fi + done - nano $next + $EDITOR $next unset cont until [ "$cont" == "0" ]; do @@ -68,7 +81,7 @@ apply_patch () { if [ "`grep '^Bad:' $TMP2`" != "" ]; then echo "*** ERROR: Patch bad formed. Please fix." sleep 1 - nano $next + $EDITOR $next cont=1 fi done |