X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=21bcbb17c33067abb53bee037efc1e136e07d2c4;hb=0e1df5636799153ae78c13d299b772b0654106c8;hp=9801fdfdf25017121d9804e11d16a1d3d7d2adc1;hpb=f03029122030891297d483fde20a3299356e3af1;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 9801fdfd..21bcbb17 100755 --- 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 @@ -514,6 +514,8 @@ class DBConn(Singleton): 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)