From 9d5b8a243cbfac882815d048f4ee14ffedc1cc6c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 6 Nov 2014 00:20:18 +0000 Subject: [PATCH] check-patches.sh: Validate Forwarded value slightly better Don't confuse 'no' with 'not-needed'. Don't accept values other than 'no', 'not-needed' and URLs which we assume must begin with 'http'. svn path=/dists/sid/linux/; revision=22043 --- debian/bin/check-patches.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/bin/check-patches.sh b/debian/bin/check-patches.sh index 132c224c9..5885412f8 100755 --- a/debian/bin/check-patches.sh +++ b/debian/bin/check-patches.sh @@ -19,8 +19,8 @@ fgrep -v -f $TMPDIR/goodheaders $TMPDIR/used || test $? = 1 echo echo "Patches without Origin or Forwarded header" echo "==========================================" -xargs egrep -L '^(Origin|Forwarded):' < $TMPDIR/used || test $? = 1 +xargs egrep -L '^(Origin:|Forwarded: (no\b|not-needed|http))' < $TMPDIR/used || test $? = 1 echo echo "Patches to be forwarded" echo "=======================" -xargs egrep -l '^Forwarded: no' < $TMPDIR/used | grep -v ^debian/patches/debian/ || test $? = 1 +xargs egrep -l '^Forwarded: no\b' < $TMPDIR/used || test $? = 1