Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  Add a newline between two changelog entries
  Check if upload already has a changelog entry
  Replace base_filename with os.path.basename

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
index acd23c2b93def9d145fd41c9c767f28471ec2f6b..a6f4e192e72c14f9b43dece8b471595478b3afe3 100755 (executable)
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -171,12 +171,12 @@ def main():
         uploads = get_binary_uploads(suite, base_suite, session)
         session.commit()
         for upload in uploads:
-            print upload[3]
+            print upload[3] + "\n"
     else:
         uploads = get_source_uploads(suite, base_suite, session)
         session.commit()
         for upload in uploads:
-            print upload[2]
+            print upload[2] + "\n"
 
 if __name__ == '__main__':
     main()

diff --git a/daklib/queue.py b/daklib/queue.py
index 58fdf7f3115acc306807405457aa88386cf87881..3ab87246d1601f1fc5dd52912293deb155f95b38 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -454,7 +454,7 @@ class Upload(object):
 
         # Check the .changes is non-empty
         if not self.pkg.files:
-            self.rejects.append("%s: nothing to do (Files field is empty)." % (base_filename))
+            self.rejects.append("%s: nothing to do (Files field is empty)." % (os.path.basename(self.pkg.changes_file)))
             return False
 
         # Changes was syntactically valid even if we'll reject
@@ -2686,6 +2686,15 @@ distribution."""
 
         session = DBConn().session()
 
+        # Check if upload already has a changelog entry
+        query = """SELECT changelog_id FROM changes WHERE source = :source
+                   AND version = :version AND architecture = :architecture AND changelog_id != 0"""
+        if session.execute(query, {'source': self.pkg.changes['source'], \
+                                   'version': self.pkg.changes['version'], \
+                                   'architecture': " ".join(self.pkg.changes['architecture'].keys())}).rowcount:
+            session.commit()
+            return
+
         # Add current changelog text into changelogs_text table, return created ID
         query = "INSERT INTO changelogs_text (changelog) VALUES (:changelog) RETURNING id"
         ID = session.execute(query, {'changelog': self.pkg.changes['changes']}).fetchone()[0]