X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=68d59a0b4e66ad28d4479db39be697870c2bb54b;hb=9e78deadeefb78533360179077669f763f0f483c;hp=d1005702b3f71ea72816ad28f1ef4f701063540d;hpb=d1429a5ed3d1914ccc502ae146b32445967e9ba8;p=dak.git diff --git a/kelly b/kelly index d1005702..68d59a0b 100755 --- a/kelly +++ b/kelly @@ -1,8 +1,8 @@ #!/usr/bin/env python -# Installs Debian packages -# Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $Id: kelly,v 1.8 2003-03-14 19:06:02 troup Exp $ +# Installs Debian packages from queue/accepted into the pool +# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup +# $Id: kelly,v 1.15 2005-01-14 14:07:17 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 @@ -18,8 +18,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# Originally based on dinstall by Guy Maor - ############################################################################### # Cartman: "I'm trying to make the best of a bad situation, I don't @@ -32,14 +30,14 @@ ############################################################################### -import fcntl, os, sys, time; +import errno, fcntl, os, sys, time; import apt_pkg; import db_access, katie, logging, utils; ############################################################################### # Globals -kelly_version = "$Revision: 1.8 $"; +kelly_version = "$Revision: 1.15 $"; Cnf = None; Options = None; @@ -110,20 +108,24 @@ 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 if not installing_to_stable: if files[file]["type"] == "deb": - reject(Katie.check_binary_against_db(file)); + reject(Katie.check_binary_against_db(file), ""); elif files[file]["type"] == "dsc": - reject(Katie.check_source_against_db(file)); + reject(Katie.check_source_against_db(file), ""); (reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file); reject(reject_msg, ""); @@ -271,6 +273,7 @@ def install (): fingerprint_id = db_access.get_or_set_fingerprint_id(dsc["fingerprint"]); install_date = time.strftime("%Y-%m-%d"); filename = files[file]["pool name"] + file; + dsc_component = files[file]["component"]; dsc_location_id = files[file]["location id"]; if not files[file].has_key("files id") or not files[file]["files id"]: files[file]["files id"] = db_access.set_files_id (filename, files[file]["size"], files[file]["md5sum"], dsc_location_id) @@ -307,7 +310,6 @@ def install (): architecture = files[file]["architecture"] architecture_id = db_access.get_architecture_id (architecture); type = files[file]["dbtype"]; - dsc_component = files[file]["component"] source = files[file]["source package"] source_version = files[file]["source version"]; filename = files[file]["pool name"] + file; @@ -332,7 +334,7 @@ def install (): orig_tar_id = Katie.pkg.orig_tar_id; orig_tar_location = Katie.pkg.orig_tar_location; legacy_source_untouchable = Katie.pkg.legacy_source_untouchable; - if orig_tar_id != None and orig_tar_location == "legacy": + if orig_tar_id and orig_tar_location == "legacy": q = projectB.query("SELECT DISTINCT ON (f.id) l.path, f.filename, f.id as files_id, df.source, df.id as dsc_files_id, f.size, f.md5sum FROM files f, dsc_files df, location l WHERE df.source IN (SELECT source FROM dsc_files WHERE file = %s) AND f.id = df.file AND l.id = f.location AND (l.type = 'legacy' OR l.type = 'legacy-mixed')" % (orig_tar_id)); qd = q.dictresult(); for qid in qd: @@ -352,7 +354,7 @@ def install (): # cross-component we need to copy the .orig.tar.gz into the new # component too for the same reasons as above. # - if changes["architecture"].has_key("source") and orig_tar_id != None and \ + if changes["architecture"].has_key("source") and orig_tar_id and \ orig_tar_location != "legacy" and orig_tar_location != dsc_location_id: q = projectB.query("SELECT l.path, f.filename, f.size, f.md5sum FROM files f, location l WHERE f.id = %s AND f.location = l.id" % (orig_tar_id)); ql = q.getresult()[0]; @@ -390,11 +392,10 @@ def install (): projectB.query("COMMIT WORK"); # Move the .changes into the 'done' directory - try: - utils.move (pkg.changes_file, os.path.join(Cnf["Dir::Queue::Done"], os.path.basename(pkg.changes_file))); - except: - utils.warn("couldn't move changes file '%s' to DONE directory. [Got %s]" % (os.path.basename(pkg.changes_file), sys.exc_type)); + utils.move (pkg.changes_file, + os.path.join(Cnf["Dir::Queue::Done"], os.path.basename(pkg.changes_file))); + # Remove the .katie file os.unlink(Katie.pkg.changes_file[:-8]+".katie"); if changes["architecture"].has_key("source") and Urgency_Logger: @@ -491,7 +492,7 @@ def stable_install (summary, short_summary): for file in files.keys(): if files[file]["type"] == "deb": new_changelog.write("stable/%s/binary-%s/%s\n" % (files[file]["component"], files[file]["architecture"], file)); - elif utils.re_issource.match(file) != None: + elif utils.re_issource.match(file): new_changelog.write("stable/%s/source/%s\n" % (files[file]["component"], file)); else: new_changelog.write("%s\n" % (file)); @@ -581,7 +582,7 @@ def main(): utils.fubar("Couldn't obtain lock; assuming another kelly is already running."); else: raise; - Logger = Katie.Logger = logging.Logger(Cnf, "katie"); + Logger = Katie.Logger = logging.Logger(Cnf, "kelly"); if not installing_to_stable and Cnf.get("Dir::UrgencyLog"): Urgency_Logger = Urgency_Log(Cnf);