From 23c6325551ac3c23cf87fbcda6d2afac01876b36 Mon Sep 17 00:00:00 2001 From: James Troup Date: Fri, 10 May 2002 00:24:33 +0000 Subject: [PATCH] ignoring of .orig.tar.gz duplication fixes --- jennifer | 8 ++++++-- katie.py | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/jennifer b/jennifer index 1f1016bc..a7fec143 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002 James Troup -# $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 4595cb2d..0031d564 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001, 2002 James Troup -# $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]; -- GitLab