From: Michael Casadevall <sonicmctails@gmail.com>
Date: Tue, 23 Dec 2008 17:49:48 +0000 (-0500)
Subject: Removed symlink_dist from dak.py (however, make_suite_file_list still depends
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d95b0a148ea38f20e44c1833bb21901f856c4f04;hp=8123375b36cc39161fb6338fdd442c3a86582d3b;p=dak.git

Removed symlink_dist from dak.py (however, make_suite_file_list still depends
on it; likely a missing commit there)

Changed process_accepted.py to properly handle cross-component moves.

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
---

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():