make_changelog.py: fix newlines between entries

Allow a single newline between changes originating
from the same source package, add two newlines between
two different source packages.

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index 73d86b48611eda2f6233a9fe99639963d723a153..0c08a44215bb8b7a8e18cdbcc6996529d11bb603 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -165,6 +165,14 @@ def testing_summary(summary, session):
 
     return session.execute(query)
 
+def display_changes(uploads, index):
+    prev_upload = None
+    for upload in uploads:
+        if prev_upload and prev_upload != upload[0]:
+            print
+        print upload[index]
+        prev_upload = upload[0]
+
 def main():
     Cnf = utils.get_conf()
     Arguments = [('h','help','Make-Changelog::Options::Help'),
@@ -194,17 +202,11 @@ def main():
     session = DBConn().session()
 
     if testing:
-        uploads = testing_summary(Cnf['Changelogs::Testing'], session)
-        for upload in uploads:
-            print upload[1] + '\n'        
+        display_changes(testing_summary(Cnf['Changelogs::Testing'], session), 1)
     elif binnmu:
-        uploads = get_binary_uploads(suite, base_suite, session)
-        for upload in uploads:
-            print upload[3] + '\n'
+        display_changes(get_binary_uploads(suite, base_suite, session), 3)
     else:
-        uploads = get_source_uploads(suite, base_suite, session)
-        for upload in uploads:
-            print upload[2] + '\n'
+        display_changes(get_source_uploads(suite, base_suite, session), 2)
 
     session.commit()