Only master merges set bugs to FixCommitted

Fix bug 888479:
Only allow master branch merges to set bug status to FixCommitted.
For other branches (think stable/diablo or milestone-proposed), set
a in-BRANCHNAME tag instead, to allow for efficient searching.

Change-Id: I6401ab4ba92f7983040ac8b2008c88490e2589d8
This commit is contained in:
Thierry Carrez 2011-11-10 12:02:03 +01:00
parent 2893549502
commit fa41ae0c0b

View File

@ -105,10 +105,14 @@ def send_bug_mail(bug_number, change_url, project, commit, submitter, branch, gi
body = '''Reviewed: %s
Committed: %s
Submitter: %s
Branch: %s
Branch: %s\n''' % (change_url, gitorious_url, submitter, branch)
status fixcommitted
done\n''' % (change_url, gitorious_url, submitter, branch)
if branch == 'master':
body = body + '\n status fixcommitted\n done\n'
else:
branch_name = branch.replace('/','-')
if branch_name.replace('-','').isalnum():
body = body + '\n tag in-%s\n done\n' % branch_name
body = body + '\n' + git_log