Improve feedback message about no git commit issue

Change-Id: Iced02e79f8a4d4a065aa7eff3df5dd65c8350b3f
Signed-off-by: Lin Yang <lin.a.yang@intel.com>
Reviewed-on: https://otctools.jf.intel.com/review/5701
Tested-by: OTC Tools Tester <ed.bartosh@linux.intel.com>
Reviewed-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/job_submitobs.py b/job_submitobs.py
index d875f5b..79a7e2d 100755 (executable)
--- a/job_submitobs.py
+++ b/job_submitobs.py
@@ -40,7 +40,8 @@ UNDER_REVIEW_MSG = '- The commit %s is still under review in gerrit. '\
 
 WRONG_COMMIT_MSG = '- The commit %s tag attached does NOT exist in git tree or'\
                    ' gerrit open change. Please make sure the commit has been '\
-                   'pushed to gerrit and correct magical ref refs/for/branch.'
+                   'pushed to gerrit and correct magical ref refs/for/branch, '\
+                   'then re-submit tag.'
 
 UNKNOWN_FORMAT_MSG = '- Unknown tag format, please follow the format '\
                      'submit/{version}/{date.time}.'
@@ -160,7 +161,8 @@ def check_tag_format(git, mygerrit, event, tag):
         msg = 'The tag %s was pushed, but it was not completed because of '\
                 'the following reason(s):\n\n' % tag + '\n'.join(message)
 
-        if len(message) != 1 or message[0] != UNDER_REVIEW_MSG % psr:
+        if len(message) != 1 or (message[0] != UNDER_REVIEW_MSG % psr and\
+               message[0] != WRONG_COMMIT_MSG % psr):
             msg += '\n\n' + SUGGESTION
 
         mygerrit.review(commit = psr, message = msg)