[Intel-gfx] [dim PATCH 7/7] dim: propagate errors from check_maintainer
Jani Nikula
jani.nikula at intel.com
Thu Mar 23 10:06:22 UTC 2017
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
dim | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dim b/dim
index 7b6275e7796f..989674ab7a91 100755
--- a/dim
+++ b/dim
@@ -701,7 +701,9 @@ function dim_apply_branch
if ! checkpatch_commit HEAD; then
rv=1
fi
- check_maintainer $branch HEAD
+ if ! check_maintainer $branch HEAD; then
+ rv=1
+ fi
eval $DRY $DIM_POST_APPLY_ACTION
@@ -1090,7 +1092,7 @@ function dim_conf
# $2 commit
function check_maintainer
{
- local branch commit
+ local branch commit rv
branch=$1
commit=$2
@@ -1101,8 +1103,11 @@ function check_maintainer
echo -e "The following files are outside of i915 maintenance scope:\n"
echo "$non_i915_files"
echo -e "\nConfirm you have appropriate Acked-by and Reviewed-by for above files."
+ rv=1
fi
fi
+
+ return $rv
}
# $1 is the git sha1 to check
--
2.1.4
More information about the Intel-gfx
mailing list