Various fixes

Signed-off-by: Frank Lichtenheld <djpig@debian.org>

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index f7ef853dc6cce6bfe531facd5b298bb8bf5a5337..1eaa3a7be53790274cd1e17c94f4f5e29315acf4 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2045,6 +2045,7 @@ def add_dsc_to_db(u, filename, session=None):
     if not entry.has_key("files id") or not entry["files id"]:
         filename = entry["pool name"] + filename
         poolfile = add_poolfile(filename, entry, dsc_location_id, session)
+        session.flush()
         entry["files id"] = poolfile.file_id
 
     source.poolfile_id = entry["files id"]

diff --git a/daklib/queue.py b/daklib/queue.py
index 9f731091c736163cd079de060dd2659690f76678..eaac573062e5c9a827a5bae5f50af5fcf57953d2 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -288,6 +288,7 @@ class Upload(object):
         for title, messages in msgs:
             if messages:
                 msg += '\n\n%s:\n%s' % (title, '\n'.join(messages))
+        msg += '\n'
 
         return msg