Merge commit 'stew/master' into merge

* commit 'stew/master':
  must import pg...
  escape strings for comments on packages and comment authors

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

diff --git a/daklib/database.py b/daklib/database.py
index a52555682624ca8aac8fa693acac8f805eb797f4..fc8dd677d9dd0d91ed857a24ccea7648d0e98eaa 100755 (executable)
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -34,6 +34,7 @@ import sys
 import time
 import types
 import utils
+import pg
 from binary import Binary
 
 ################################################################################
@@ -907,7 +908,7 @@ def add_new_comment(package, version, comment, author):
 
     projectB.query(""" INSERT INTO new_comments (package, version, comment, author)
                        VALUES ('%s', '%s', '%s', '%s')
-    """ % (package, version, comment, author) )
+    """ % (package, version, pg.escape_string(comment), pg.escape_string(author)))
 
     return