ignoring of .orig.tar.gz duplication fixes

diff --git a/jennifer b/jennifer
index 1f1016bcc285eb8f60d100e070d57adda097ecf1..a7fec143b1b7f37102b386c3ecdeb6d35bc8ca72 100755 (executable)
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.16 2002-05-08 11:52:31 troup Exp $
+# $Id: jennifer,v 1.17 2002-05-10 00:24:33 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
@@ -43,7 +43,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.16 $";
+jennifer_version = "$Revision: 1.17 $";
 
 Cnf = None;
 Options = None;
@@ -693,6 +693,10 @@ def check_dsc ():
     global reprocess;
 
     for file in files.keys():
+        # The .orig.tar.gz can disappear out from under us is it's a
+        # duplicate of one in the archive.
+        if not files.has_key(file):
+            continue;
         if files[file]["type"] == "dsc":
             # Parse the .dsc file
             try:

diff --git a/katie.py b/katie.py
index 4595cb2dd594b36905e74725e92a673c1a50eb08..0031d5645c03b719f2b695dd2ad1a928b9077074 100644 (file)
--- a/katie.py
+++ b/katie.py
@@ -2,7 +2,7 @@
 
 # Utility functions for katie
 # Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.18 2002-05-08 11:52:31 troup Exp $
+# $Id: katie.py,v 1.19 2002-05-10 00:24:33 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
@@ -724,10 +724,12 @@ distribution.""";
 
                 ql = q.getresult();
                 if ql:
+                    # Ignore exact matches for .orig.tar.gz
                     match = 0;
                     if dsc_file[-12:] == ".orig.tar.gz":
                         for i in ql:
-                            if int(files[dsc_file]["size"]) == int(i[0]) and \
+                            if files.has_key(dsc_file) and \
+                               int(files[dsc_file]["size"]) == int(i[0]) and \
                                files[dsc_file]["md5sum"] == i[1]:
                                 self.reject("ignoring %s, since it's already in the archive." % (dsc_file), "Warning: ");
                                 del files[dsc_file];