From: James Troup <james@nocrew.org>
Date: Wed, 7 Apr 2004 00:12:13 +0000 (+0000)
Subject: 2004-04-07  James Troup  <james@nocrew.org>	* katie.py (Katie.check_dsc_against_db... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1bf07adfb67a93e45a3ee344450805744d04e7e0;p=dak.git

2004-04-07  James Troup  <james@nocrew.org>	* katie.py (Katie.check_dsc_against_db): in the case we're	ignoring an identical-to-existing orig.tar.gz remember the path to	the existent version in pkg.orig_tar_gz.  Adjust query to grab	location.path too to be able to do so.
---

diff --git a/TODO b/TODO
index 936baa08..2b056303 100644
--- a/TODO
+++ b/TODO
@@ -39,6 +39,9 @@ Others
     might also be a good idea to put everything in one big dict after
     that?
 
+  o [?, wishlist, distant future] RFC2047-ing should be extended to
+    all headers of mails sent out.
+
   o reject sparc64 binaries in a non '*64*' package.
 
   o katie.py(source_exists): a) we take arguments as parameters that
diff --git a/katie.py b/katie.py
index d1919044..0078e39e 100644
--- a/katie.py
+++ b/katie.py
@@ -2,7 +2,7 @@
 
 # Utility functions for katie
 # Copyright (C) 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.46 2004-04-03 02:49:46 troup Exp $
+# $Id: katie.py,v 1.47 2004-04-07 00:12:13 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
@@ -851,12 +851,11 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su
                 actual_size = int(files[dsc_file]["size"]);
                 found = "%s in incoming" % (dsc_file)
                 # Check the file does not already exist in the archive
-                q = self.projectB.query("SELECT size, md5sum, filename FROM files WHERE filename LIKE '%%%s%%'" % (dsc_file));
-
+                q = self.projectB.query("SELECT f.size, f.md5sum, l.path, f.filename FROM files f, location l WHERE f.filename LIKE '%%%s%%' AND l.id = f.location" % (dsc_file));
                 ql = q.getresult();
                 # Strip out anything that isn't '%s' or '/%s$'
                 for i in ql:
-                    if i[2] != dsc_file and i[2][-(len(dsc_file)+1):] != '/'+dsc_file:
+                    if i[3] != dsc_file and i[3][-(len(dsc_file)+1):] != '/'+dsc_file:
                         ql.remove(i);
 
                 # "[katie] has not broken them.  [katie] has fixed a
@@ -878,6 +877,7 @@ SELECT s.version, su.suite_name FROM source s, src_associations sa, suite su
                                files[dsc_file]["md5sum"] == i[1]:
                                 self.reject("ignoring %s, since it's already in the archive." % (dsc_file), "Warning: ");
                                 del files[dsc_file];
+                                self.pkg.orig_tar_gz = i[2] + i[3];
                                 match = 1;
 
                     if not match: