Change-Id: Ib1b29a247398d1d10fcdfe2368ea2b356ef7eb3e
Signed-off-by: Sam Hague <shague@redhat.com>
self.verbose = verbose
self.projects = {}
self.set_log_level(verbose)
self.verbose = verbose
self.projects = {}
self.set_log_level(verbose)
- self.regex_changeid = re.compile(r'\bI([a-f0-9]{40})\b|\bI([a-f0-9]{8})\b')
+ self.regex_changeid = re.compile(r'Change-Id.*: \bI([a-f0-9]{40})\b|\bI([a-f0-9]{8})\b')
# self.regex_shortmsg = re.compile(r'"([^"]*)"|(git.commit.message.short=(.*))')
self.regex_shortmsg1 = re.compile(r'(git.commit.message.short=.*"([^"]*)")')
self.regex_shortmsg2 = re.compile(r'(git.commit.message.short=(.*))')
# self.regex_shortmsg = re.compile(r'"([^"]*)"|(git.commit.message.short=(.*))')
self.regex_shortmsg1 = re.compile(r'(git.commit.message.short=.*"([^"]*)")')
self.regex_shortmsg2 = re.compile(r'(git.commit.message.short=(.*))')
logger.info("did not find Change-Id from git.properties in %s, trying commitid", project)
logger.info("did not find Change-Id from git.properties in %s, trying commitid", project)
- # match a 40 or 8 char Change-Id hash. both start with I
+ # match a git commit id
commitid = self.regex_commitid.search(pfile)
if commitid and commitid.group(2):
logger.info("trying commitid from git.properties in %s: %s", project, commitid.group(2))
commitid = self.regex_commitid.search(pfile)
if commitid and commitid.group(2):
logger.info("trying commitid from git.properties in %s: %s", project, commitid.group(2))