X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=21bcbb17c33067abb53bee037efc1e136e07d2c4;hb=0e1df5636799153ae78c13d299b772b0654106c8;hp=60f0cd3ed3cfeb14e2b317ceeb6891dc706dcde1;hpb=e9888f099c0e44f0c7b2c0c8522a9e8fc732c95f;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 60f0cd3e..21bcbb17 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -398,7 +398,7 @@ 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: @@ -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)