[commit-to-changelog] Bugfix.

The commit-to-changelog script would crash for commits that already
contain ChangeLog entries.

1 files changed, 3 insertions, 1 deletions

diff --git a/scripts/commits-to-changelog.py b/scripts/commits-to-changelog.py
index fa2079fbfdd..ba68a6f67e8 100755
--- a/scripts/commits-to-changelog.py
+++ b/scripts/commits-to-changelog.py
@@ -144,7 +144,7 @@ def debug_print_commit (commit, raw_message, prefix, file_entries, changed_files
 def process_commit (commit):
     changed_files = map (lambda l: l.split () [2], git ("diff-tree", "--numstat", commit).splitlines () [1:])
     if len (filter (lambda f: re.search ("(^|/)Change[Ll]og$", f), changed_files)):
-        return
+        return None
     raw_message = git ("log", "-n1", "--format=%B", commit)
     # filter SVN migration message
     message = re.sub ("(^|\n)svn path=[^\n]+revision=\d+(?=$|\n)", "", raw_message)
@@ -251,6 +251,8 @@ def main ():
     touched_changelogs = {}
     for commit in commits:
         entries = process_commit (commit)
+        if entries == None:
+            continue
         for (changelog, lines) in entries.items ():
             if changelog not in touched_changelogs:
                 touched_changelogs [changelog] = start_changelog (changelog)