From: Joerg Jaspert Date: Sun, 7 Sep 2008 20:51:34 +0000 (+0200) Subject: Merge commit 'pkern/master' X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f4305d94f470563b53ea893967f89e922d5a53f9;hp=60b5dcd3ef84f26959c514cb7730e1d1a1e4e4f8;p=dak.git Merge commit 'pkern/master' * commit 'pkern/master': dak/process_accepted.py (install): use dsc_file instead of file Signed-off-by: Joerg Jaspert --- diff --git a/ChangeLog b/ChangeLog index 140b1dfd..d52a5c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * daklib/utils.py (check_hash): try..except..finally only works on python >=2.5. + * dak/process_accepted.py (install): better use dsc_file + instead of the (for the loop iteration) static file + variable + 2008-09-07 Philipp Kern * daklib/utils.py (check_hash): change the comment and warn diff --git a/dak/process_accepted.py b/dak/process_accepted.py index 1e3997eb..6013b18c 100755 --- a/dak/process_accepted.py +++ b/dak/process_accepted.py @@ -318,7 +318,7 @@ def install (): files_id = database.get_files_id(filename, dsc_files[dsc_file]["size"], dsc_files[dsc_file]["md5sum"], dsc_location_id) # FIXME: needs to check for -1/-2 and or handle exception if files_id == None: - files_id = database.set_files_id (filename, dsc_files[dsc_file]["size"], dsc_files[dsc_file]["md5sum"], files[file]["sha1sum"], files[file]["sha256sum"], dsc_location_id) + files_id = database.set_files_id (filename, dsc_files[dsc_file]["size"], dsc_files[dsc_file]["md5sum"], files[dsc_file]["sha1sum"], files[dsc_file]["sha256sum"], dsc_location_id) projectB.query("INSERT INTO dsc_files (source, file) VALUES (currval('source_id_seq'), %d)" % (files_id)) # Add the src_uploaders to the DB