diff options
| -rwxr-xr-x | mailimport | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/mailimport b/mailimport index b13f4c662..12ab2f8d8 100755 --- a/mailimport +++ b/mailimport @@ -141,7 +141,8 @@ proccess_patch () { i="$_" - if [ "`diffstat -p1 -l $i`" == "" ]; then + echo $i + if [ "`diffstat -p1 -l "$i"`" == "" ]; then echo "*** ERROR nothing to commit" cd $cur exit @@ -197,7 +198,13 @@ if [ "$CHECKPATCH" == "" ]; then CHECKPATCH="/lib/modules/`uname -r`/build/scripts/checkpatch.pl" fi -DIR=$TMPDIR/mailimport$$ +NAME="$1" + +if [ ! -r $NAME ]; then + sudo chmod og+r $NAME +fi + +DIR="$TMPDIR/mailimport$$" mkdir $DIR if [ "$?" != "0" ]; then echo "*** Error at mkdir $DIR" @@ -205,24 +212,26 @@ if [ "$?" != "0" ]; then fi trap "rm -rf $DIR" EXIT -if [ -d "$1" ]; then - TMP2=$DIR/patchheader +if [ -d "$NAME" ]; then + TMP2="$DIR/patchheader" - if [ -e "$1/series" ]; then - for i in `cat "$1/series"|grep -v "^#"`; do - echo $1/$i - proccess_patch "$1/$i" + if [ -e "$NAME/series" ]; then + echo "Processing quilt tree $NAME" + for i in `cat "$NAME/series"|grep -v "^#"`; do + echo "$NAME/$i" + proccess_patch "$NAME/$i" done else - for i in $1/*; do - proccess_patch $i + echo "Processing patches from tree $NAME" + for i in $NAME/*; do + echo "$i" + proccess_patch "$i" done fi else - MBOX="$1" TMP2=$DIR/patchheader - grep -v -f - $MBOX >$DIR/tmpbox <<EOF + grep -v -f - $NAME >$DIR/tmpbox <<EOF ^Content-Type: ^--Boundary- ^Content-Disposition: inline @@ -239,4 +248,3 @@ EOF proccess_patch $i done fi - |