Merge commit 'buxy/bugfixes' into merge

[dak.git] / daklib / database.py

diff --git a/daklib/database.py b/daklib/database.py
index b66f3d83dba6560ce3004fcaa57336e77a903d35..a52555682624ca8aac8fa693acac8f805eb797f4 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -851,12 +851,14 @@ def get_new_comments(package):
     """
 
     comments = []
-    query = projectB.query(""" SELECT version, comment, author
+    query = projectB.query(""" SELECT version, comment, author, notedate
                                FROM new_comments
-                               WHERE package = '%s' """ % (package))
+                               WHERE package = '%s'
+                               ORDER BY notedate
+                           """ % (package))
 
     for row in query.getresult():
-        comments.append("\nAuthor: %s\nVersion: %s\n\n%s\n" % (row[2], row[0], row[1]))
+        comments.append("\nAuthor: %s\nVersion: %s\nTimestamp: %s\n\n%s\n" % (row[2], row[0], row[3], row[1]))
         comments.append("-"*72)
 
     return comments
@@ -882,9 +884,9 @@ def has_new_comment(package, version):
                             % (package, version) ).getresult()
 
     if not exists:
-        return false
+        return False
     else:
-        return true
+        return True
 
 def add_new_comment(package, version, comment, author):
     """