X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=37b6db47eaad63ad268f13a8dfa04ea93fa7f968;hb=c5617d291dc17395a9d23c757d7dc815f6eed49e;hp=d1005702b3f71ea72816ad28f1ef4f701063540d;hpb=d1429a5ed3d1914ccc502ae146b32445967e9ba8;p=dak.git diff --git a/kelly b/kelly index d1005702..37b6db47 100755 --- a/kelly +++ b/kelly @@ -2,7 +2,7 @@ # Installs Debian packages # Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $Id: kelly,v 1.8 2003-03-14 19:06:02 troup Exp $ +# $Id: kelly,v 1.10 2003-07-29 14:00:39 ajt 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 @@ -39,7 +39,7 @@ import db_access, katie, logging, utils; ############################################################################### # Globals -kelly_version = "$Revision: 1.8 $"; +kelly_version = "$Revision: 1.10 $"; Cnf = None; Options = None; @@ -110,12 +110,16 @@ def reject (str, prefix="Rejected: "): def check(): 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; # Check that the source still exists if files[file]["type"] == "deb": source_version = files[file]["source version"]; source_package = files[file]["source package"]; if not changes["architecture"].has_key("source") \ - and not Katie.source_exists(source_package, source_version): + and not Katie.source_exists(source_package, source_version, changes["distribution"].keys()): reject("no source found for %s %s (%s)." % (source_package, source_version, file)); # Version and file overwrite checks