author | Jianxiong Pan <jianxiong.pan@amlogic.com> | 2018-10-23 04:24:57 (GMT) |
---|---|---|
committer | Jianxiong Pan <jianxiong.pan@amlogic.com> | 2018-10-23 05:22:03 (GMT) |
commit | cdc14a2bb856be98f863bbfd8fc40ac2685bcfdd (patch) | |
tree | 8b460fa4d1c5a34f393fdad1ad13c21ccf09f810 | |
parent | 09f912276e155ba54564ca5bacad17e740aad561 (diff) | |
download | common-cdc14a2bb856be98f863bbfd8fc40ac2685bcfdd.zip common-cdc14a2bb856be98f863bbfd8fc40ac2685bcfdd.tar.gz common-cdc14a2bb856be98f863bbfd8fc40ac2685bcfdd.tar.bz2 |
script: fix the defects in the merge_pre_check.pl [1/1]
PD#174488
Problem:
some defects in the script.
Solution:
rechange check rules in the script.
Verify:
verified locally.
Change-Id: I9c7011d1bd3b1d52131318dae34112d0d0164a00
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
-rwxr-xr-x | scripts/amlogic/merge_pre_check.pl | 62 |
1 files changed, 8 insertions, 54 deletions
diff --git a/scripts/amlogic/merge_pre_check.pl b/scripts/amlogic/merge_pre_check.pl index b7a5d298..cb3f8b6 100755 --- a/scripts/amlogic/merge_pre_check.pl +++ b/scripts/amlogic/merge_pre_check.pl @@ -131,88 +131,42 @@ sub check_msg_49 sub check_msg_49_2 { my $msg = `git cat-file commit HEAD~0 | sed '1,/\^\$/d'`; + my @str = split /[\n][\n]/, $msg; - if( $msg !~ /^([\w]+:\s){1,2}.+(\s)\[[\d]\/[\d]\][\n][\n]/ ) + if( $str[0] !~ /^([\w]+:\s){1,2}.+(\s)\[[\d]\/[\d]\]$/ ) { $err_cnt += 1; $err_msg .= " $err_cnt: <module: message>\n"; - $msg =~ s/.+(\S)[\n]+//; } - elsif( $msg =~ /(kernel)/i ) + elsif( $str[0] =~ /(kernel)/i ) { $err_cnt += 1; $err_msg .= " $err_cnt: Should be no 'kernel' in kernel commit message\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^([\w]+:\s){1,2}.+(\S)[\n][\n]//; } - if( $msg !~ /^PD\#.+(\S)[\n][\n]/ ) + if( $str[1] !~ /^PD\#.+(\S)$/ ) { $err_cnt += 1; $err_msg .= " $err_cnt: <PD#XXXX>\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^PD\#.+(\S)[\n][\n]//; + } - if( $msg !~ /^Problem:[\n](.+(\S)[\n])+[\n]/ ) + if( $str[2] !~ /^Problem:[\n].+/ ) { $err_cnt += 1; $err_msg .= " $err_cnt: Problem:\n detailed description\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^Problem:[\n](.+(\S)[\n])+[\n]//; } - if( $msg !~ /^Solution:[\n](.+(\S)[\n])+[\n]/ ) + if( $str[3] !~ /^Solution:[\n].+/ ) { $err_cnt += 1; $err_msg .= " $err_cnt: Solution:\n detailed description\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^Solution:[\n](.+(\S)[\n])+[\n]//; } - if( $msg !~ /^Verify:[\n](.+(\S)[\n])+[\n]/ ) + if( $str[4] !~ /^Verify:[\n].+/ ) { $err_cnt += 1; $err_msg .= " $err_cnt: Verify:\n detailed description\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^Verify:[\n](.+(\S)[\n])+[\n]//; - } - - if( $msg !~ /^Change-Id:\s[\w]+(\S)[\n]/ ) - { - $err_cnt += 1; - $err_msg .= " $err_cnt: <Change-Id: xxxxx>\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^Change-Id:\s[\w]+(\S)[\n]//; - } - - if( $msg !~ /^Signed-off-by:\s.+(\S)$/ ) - { - $err_cnt += 1; - $err_msg .= " $err_cnt: <Signed-off-by: xxxxx>\n"; - $msg =~ s/.+(\S)[\n]+//; - } - else - { - $msg =~ s/^Signed-off-by:\s.+(\S)$//; } } |