X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Ffix.9;h=3c530a1c3f63c41e99b40bb4a28db637794dd003;hb=c1c7681bf43c58dd5cf34d1c1814a75ae594688b;hp=b461b9b04633a15955d9cca2e006650b1a115345;hpb=bb8283ad6274e461fc78a00b2a52c6594c53e13d;p=dak.git diff --git a/contrib/fix.9 b/contrib/fix.9 index b461b9b0..3c530a1c 100755 --- a/contrib/fix.9 +++ b/contrib/fix.9 @@ -2,7 +2,7 @@ # Fix for bug in katie where dsc_files was initialized from changes and not dsc # Copyright (C) 2000 James Troup -# $Id: fix.9,v 1.1 2000-12-05 04:27:48 troup Exp $ +# $Id: fix.9,v 1.3 2001-11-04 22:28:44 troup Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ def main (): dsc_files = utils.build_file_list(dsc, 1); q = projectB.query("SELECT s.id, l.id, l.path FROM source s, location l, files f WHERE s.source = '%s' AND s.version = '%s' AND f.id = s.file AND f.location = l.id" % (dsc["source"], dsc["version"])); ql = q.getresult(); - if ql == [] or len(ql) > 1: + if not ql or len(ql) > 1: print " EEEEEEEEEEEEEEK!!!" print " ",base_dsc_file source_id = ql[0][0]; @@ -88,7 +88,7 @@ def main (): #print " size: ", dsc_files[i]["size"] #print " md5sum: ",dsc_files[i]["md5sum"] #print " location_id: ", location_id - files_id = db_access.get_files_id(filename, repr(dsc_files[i]["size"]), dsc_files[i]["md5sum"], location_id); + files_id = db_access.get_files_id(filename, dsc_files[i]["size"], dsc_files[i]["md5sum"], location_id); if files_id < 0 or files_id == None: print " BORK!!!!!!!!!!!!" print " ",filename