[kteam-tools][PATCH 3/3] verify-release-ready: verify a _single_ blank line before signature

Kamal Mostafa kamal at canonical.com
Wed Sep 28 19:52:18 UTC 2016


Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 maintscripts/verify-release-ready | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready
index 4bb467f..3565388 100755
--- a/maintscripts/verify-release-ready
+++ b/maintscripts/verify-release-ready
@@ -411,7 +411,12 @@ class VerifyReleaseReady():
         # with two dashes, has an email address and a date/time stamp.
         #
         cl = len(content)
-        error_text = 'The final three lines of a new changelog block should be a blank line, a "signature" line, and a final blank line.'
+        error_text = 'The final lines of a new changelog block should be\n a single blank line, a "signature" line, and a final blank line.'
+
+        if content[cl - 4] == '': # Should NOT be a blank line
+            s.status('final commit content [%d]' % ei, False)
+            ei += 1
+            et.append(error_text)
 
         if content[cl - 3] != '': # Should be a blank line
             s.status('final commit content [%d]' % ei, False)
-- 
2.7.4





More information about the kernel-team mailing list