| author | Jianxiong Pan <jianxiong.pan@amlogic.com> | 2018-10-10 06:40:28 (GMT) |
|---|---|---|
| committer | Jianxin Pan <jianxin.pan@amlogic.com> | 2018-10-15 06:24:17 (GMT) |
| commit | fa6fba02af3712a5d1f43867060650b1ace2147a (patch) | |
| tree | 84f0bee3cd447d144709a348324ef9fe8d61bd40 | |
| parent | f4176cd13b7582bb5c9992fec5f3eee6c271db9d (diff) | |
| download | common-fa6fba02af3712a5d1f43867060650b1ace2147a.zip common-fa6fba02af3712a5d1f43867060650b1ace2147a.tar.gz common-fa6fba02af3712a5d1f43867060650b1ace2147a.tar.bz2 | |
script: allow JIRA BugId check in the merge_pre_check.pl script
PD#174488: add JIRA BugId check in the merge_pre_check.pl script
Change-Id: I32f2fc123041e6c40ce2a5c4208734e11b307fd5
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
| -rwxr-xr-x | scripts/amlogic/merge_pre_check.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/amlogic/merge_pre_check.pl b/scripts/amlogic/merge_pre_check.pl index 238aac0..e04be96 100755 --- a/scripts/amlogic/merge_pre_check.pl +++ b/scripts/amlogic/merge_pre_check.pl @@ -118,11 +118,12 @@ sub check_msg_49 if( $lnum == 7 ) { - if( $line !~ /^(\s){4}PD\#(\d)+/ ) + if( $line !~ /^(\s){4}PD\#(\d)+/ && + $line !~ /^(\s){4}PD\#SWPL-(\d)+/ ) { $err_cnt += 1; $line =~ s/^(\s){4}//; - $err_msg .= " $err_cnt: <PD#xxxx: detailed description>, but <$line>\n"; + $err_msg .= " $err_cnt: <PD#xxxx/PD#SWPL-XXXX: detailed description>, but <$line>\n"; } } } @@ -134,11 +135,12 @@ sub check_msg_314 if( $lnum == 5 ) { - if ($line !~ /^(\s){4}PD\#(\d)+:\s([\w]+:\s){1,2}[\w]+.*[\S]+$/) + if ($line !~ /^(\s){4}PD\#(\d)+:\s([\w]+:\s){1,2}[\w]+.*[\S]+$/ + && $line !~ /^(\s){4}PD\#SWPL-(\d)+:\s([\w]+:\s){1,2}[\w]+.*[\S]+$/) { $err_cnt += 1; $line =~ s/^(\s){4}//; - $err_msg .= " $err_cnt: <PD#XXXX: module_id: commit message>, but <$line>\n"; + $err_msg .= " $err_cnt: <PD#XXXX/PD#SWPL-XXXX: module_id: commit message>, but <$line>\n"; } elsif ( $line =~ /(kernel)/i) { |