Merge commit 'stew/master' into merge

* commit 'stew/master':
  change reject email template to solicit a reply if new files are uploaded

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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 9801fdfdf25017121d9804e11d16a1d3d7d2adc1..b532c351ac050d22ccd5434100058d520a7f04a0 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -398,11 +398,11 @@ class DBConn(Singleton):
             else:
                 row = cursor.fetchone()
 
-                if row[1] != size or row[2] != md5sum:
+                if row[1] != int(size) or row[2] != md5sum:
                     res =  -2
 
                 else:
-                    self.caches[cachename].SetValue(values, row[0])
+                    self.caches['files'].SetValue(values, row[0])
                     res = row[0]
 
         return res