From: jianxin.pan <jianxin.pan@amlogic.com>
Date: Fri, 30 Jun 2017 13:04:03 +0000 (+0800)
Subject: script: update merge_pre_check.sh
X-Git-Tag: khadas-vims-v0.9.6-release~3011
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c8e5c3b487f10c9978f00e51b577b1353003e53;p=platform%2Fkernel%2Flinux-amlogic.git

script: update merge_pre_check.sh

PD#138174: update merge_pre_check script

Change-Id: I3340906ff4fc3a61ba720fb4dabecd3f623dfcae
Signed-off-by: jianxin.pan <jianxin.pan@amlogic.com>
---

diff --git a/scripts/amlogic/merge_pre_check.pl b/scripts/amlogic/merge_pre_check.pl
index 6d8da14..cd171c5 100755
--- a/scripts/amlogic/merge_pre_check.pl
+++ b/scripts/amlogic/merge_pre_check.pl
@@ -67,6 +67,7 @@ sub check_msg_common
 	if( (length($line) > ($MAX_LEN + 4) ) && ($lnum > 4) )
 	{	#Line over 80 characters is not allowed.
 		$line =~ s/^(\s){4}//;
+		$err_cnt += 1;
 		$err_msg .= "    $err_cnt: Line over $MAX_LEN characters: <$line>\n";
 	}
 
@@ -89,19 +90,19 @@ sub check_msg_49
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
-			$err_msg .= "    $err_cnt: This line should be <[module: message>, but <$line>\n";
+			$err_msg .= "    $err_cnt: <module: message>, but <$line>\n";
 		}
 		elsif ( $line =~ /PD\#/i )
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
-			$err_msg .= "    $err_cnt: PD#XXXX should not in the first line for 4.9, but <$line>\n";
+			$err_msg .= "    $err_cnt: No PD#XXXX in the first line for 4.9, but <$line>\n";
 		}
 		elsif ( $line =~ /(kernel)/i)
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
-			$err_msg .= "    $err_cnt: No 'kernel' in this line, but <$line>\n";
+			$err_msg .= "    $err_cnt: No 'kernel' in kernel commit message, but <$line>\n";
 		}
 	}
 
@@ -121,7 +122,7 @@ sub check_msg_49
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
-			$err_msg .= "    $err_cnt: PD#xxxx: detailed description, but <$line>\n";
+			$err_msg .= "    $err_cnt: <PD#xxxx: detailed description>, but <$line>\n";
 		}
 	}
 }
@@ -137,13 +138,13 @@ sub check_msg_314
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
-			$err_msg .= "  $err_cnt: This line should be PD#XXXX: <module_id: commit message>, but <$line>\n";
+			$err_msg .= "    $err_cnt: <PD#XXXX: module_id: commit message>, but <$line>\n";
 		}
 		elsif ( $line =~ /(kernel)/i)
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
-			$err_msg .= "  $err_cnt: No 'kerenl' in this line, but <$line>\n";
+			$err_msg .= "    $err_cnt: No 'kerenl' in this line, but <$line>\n";
 		}
 	}
 
@@ -259,4 +260,4 @@ check_commit_msg();
 
 out_review();
 #out
-exit $exit;
\ No newline at end of file
+exit $exit;