From: Philipp Kern <pkern@debian.org>
Date: Sun, 7 Sep 2008 20:50:06 +0000 (+0200)
Subject: dak/process_accepted.py (install): use dsc_file instead of file
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1b357f9b4f794fa56f4ee5b107167c7ecff3ac0a;p=dak.git

dak/process_accepted.py (install): use dsc_file instead of file

        * dak/process_accepted.py (install): better use dsc_file
        instead of the (for the loop iteration) static file
        variable

Signed-off-by: Philipp Kern <pkern@debian.org>

# Please enter the commit message for your changes.
# (Comment lines starting with '#' will not be included)
# On branch new-master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   ChangeLog
#	modified:   dak/process_accepted.py
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#	modified:   daklib/database.py
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	config/asterix/
#	diff
#	ftp/
#	incoming/
#	lock/
#	log/
#	queue/
#	web/removals.txt
---

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  <pkern@debian.org>
 
 	* 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