From: Michael Casadevall <sonicmctails@gmail.com>
Date: Tue, 23 Dec 2008 19:45:24 +0000 (-0500)
Subject: Merge commit 'dak-master/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ce92ea18c6e14348f16f0e50b2d70ba54381b0aa;hp=1fce382846c9a7d1e55fda54501aa09872a1ed37;p=dak.git

Merge commit 'dak-master/master'
---

diff --git a/dak/dak.py b/dak/dak.py
index 193b4659..9dfd026b 100755
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -162,8 +162,6 @@ def init():
          "Split queue/done into a date-based hierarchy"),
         ("stats",
          "Generate statistics"),
-        ("symlink-dists",
-         "Generate compatability symlinks from dists/ into pool/"),
         ]
     return functionality
 
diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 6013b18c..0d5a5387 100755
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -408,7 +408,7 @@ def install ():
         if new_files_id == None:
             utils.copy(old_filename, Cnf["Dir::Pool"] + new_filename)
             new_files_id = database.set_files_id(new_filename, file_size, file_md5sum, file_sha1sum, file_sha256sum, dsc_location_id)
-            projectB.query("UPDATE dsc_files SET file = %s WHERE source = %s AND file = %s" % (new_files_id, source_id, orig_tar_id))
+            projectB.query("UPDATE dsc_files SET file = %s WHERE source = %s AND file = %s" % (new_files_id, database.get_source_id(changes["source"], changes["version"]), orig_tar_id))
 
     # Install the files into the pool
     for file in files.keys():