summaryrefslogtreecommitdiff
path: root/mailimport
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-05 10:20:56 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-05 10:20:56 -0300
commit5f2d82cefe0ce930f3146875c88b993695c7e03a (patch)
tree2d33fe6b5949e509d85f48f5c8331adcb22151d3 /mailimport
parentad789ba2904603896206a72f0445e8ba56da7134 (diff)
parent2257e70baa578d959dc4bdcce498ef07d2af00da (diff)
downloadmediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.gz
mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Fixed a trivial conflict between a janitor's patch from Hans Verkuil and Andy patch series. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'mailimport')
-rwxr-xr-xmailimport6
1 files changed, 6 insertions, 0 deletions
diff --git a/mailimport b/mailimport
index bd6d36c2e..8ed624179 100755
--- a/mailimport
+++ b/mailimport
@@ -165,6 +165,12 @@ proccess_patch ()
{
i="$_"
+ CHECK="`cat $i| perl -ne 'if (m/^Subject:.*FOLDER INTERNAL DATA/) { print -1; }'`"
+
+ if [ "$CHECK" != "" ]; then
+ return
+ fi
+
echo $i
if [ "`diffstat -p1 -l "$i"`" == "" ]; then
echo "*** ERROR nothing to commit"