Index: tools/push-to-trunk/merge_to_branch.py |
diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/push-to-trunk/merge_to_branch.py |
index 713768926b39c15df887c989132f3052c4e3ad29..ac02b547ad0b58ecfe9617b3a34f90f6e8212d58 100755 |
--- a/tools/push-to-trunk/merge_to_branch.py |
+++ b/tools/push-to-trunk/merge_to_branch.py |
@@ -147,7 +147,7 @@ class FindGitRevisions(Step): |
for bug in re.findall(r"^[ \t]*BUG[ \t]*=[ \t]*(.*?)[ \t]*$", msg, |
re.M): |
bugs.extend(map(lambda s: s.strip(), bug.split(","))) |
- bug_aggregate = ",".join(sorted(bugs)) |
+ bug_aggregate = ",".join(sorted(filter(lambda s: s and s != "none", bugs))) |
if bug_aggregate: |
self["new_commit_msg"] += "BUG=%s\nLOG=N\n" % bug_aggregate |