Merge branch 'master' into content_generation

diff --combined daklib/dbconn.py
index 38791290b244a8b6c65987277bfed71b5483668d,b532c351ac050d22ccd5434100058d520a7f04a0..21bcbb17c33067abb53bee037efc1e136e07d2c4
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -398,11 -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
@@@ -514,8 -514,6 +514,8 @@@
              for fullpath in fullpaths:
                  (path, file) = os.path.split(fullpath)
  
 +                if path.startswith( "./" ):
 +                    path = path[2:]
                  # Get the necessary IDs ...
                  file_id = self.get_or_set_contents_file_id(file)
                  path_id = self.get_or_set_contents_path_id(path)