X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie;h=08e6d4fa4158a2a714da927b57bb40b6806fb78e;hb=d889e5903fc6da2f7ba081dca17c457a20db5fa0;hp=01c6cf2d6c07d149e11e11c6a4da9542ce3a0974;hpb=5585dd6c37241f7d914976cad162d74650d75622;p=dak.git diff --git a/katie b/katie index 01c6cf2d..08e6d4fa 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packages # Copyright (C) 2000, 2001 James Troup -# $Id: katie,v 1.74 2002-03-08 03:21:57 rmurray Exp $ +# $Id: katie,v 1.79 2002-04-24 01:56:24 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 @@ -39,7 +39,7 @@ import db_access, katie, logging, utils; ############################################################################### # Globals -katie_version = "$Revision: 1.74 $"; +katie_version = "$Revision: 1.79 $"; Cnf = None; Options = None; @@ -59,6 +59,8 @@ Subst = None; install_count = 0; install_bytes = 0.0; +installing_to_stable = 0; + ############################################################################### # FIXME: this should go away to some Debian specific file @@ -121,12 +123,13 @@ def check(): if not Katie.in_override_p(files[file]["package"], files[file]["component"], suite, files[file].get("dbtype",""), file): reject("%s is NEW for %s." % (file, suite)); - if files[file]["type"] == "deb": - reject(Katie.check_binaries_against_db(file, suite)); - elif files[file]["type"] == "dsc": - reject(Katie.check_source_against_db(file)); - (reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file); - reject(reject_msg); + if not installing_to_stable: + if files[file]["type"] == "deb": + reject(Katie.check_binaries_against_db(file, suite)); + elif files[file]["type"] == "dsc": + reject(Katie.check_source_against_db(file)); + (reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file); + reject(reject_msg); ############################################################################### @@ -205,7 +208,10 @@ def action (): if answer == 'R': do_reject (); elif answer == 'I': - install (); + if not installing_to_stable: + install(); + else: + stable_install(summary, short_summary); elif answer == 'Q': sys.exit(0) @@ -299,7 +305,9 @@ def install (): source = files[file]["source package"] source_version = files[file]["source version"]; filename = files[file]["pool name"] + file; - if not file[file].has_key("files id") or not files[file]["files id"]: + if not files[file].has_key("location id") or not files[file]["location id"]: + files[file]["location id"] = db_access.get_location_id(Cnf["Dir::PoolDir"],files[file]["component"],utils.where_am_i()); + 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"], files[file]["location id"]) source_id = db_access.get_source_id (source, source_version); if source_id: @@ -345,7 +353,7 @@ def install (): old_filename = ql[0] + ql[1]; file_size = ql[2]; file_md5sum = ql[3]; - new_filename = utils.poolify (changes["source"], dsc_component) + os.path.basename(old_filename); + new_filename = utils.poolify(changes["source"], dsc_component) + os.path.basename(old_filename); new_files_id = db_access.get_files_id(new_filename, file_size, file_md5sum, dsc_location_id); if new_files_id == None: utils.copy(old_filename, Cnf["Dir::PoolDir"] + new_filename); @@ -354,15 +362,18 @@ def install (): # Install the files into the pool for file in files.keys(): - destination = Cnf["Dir::PoolDir"] + files[file]["pool name"] + file - utils.move (file, destination) + destination = Cnf["Dir::PoolDir"] + files[file]["pool name"] + file; + utils.move(file, destination); Logger.log(["installed", file, files[file]["type"], files[file]["size"], files[file]["architecture"]]); - install_bytes = install_bytes + float(files[file]["size"]) + install_bytes = install_bytes + float(files[file]["size"]); # Copy the .changes file across for suite which need it. for suite in changes["distribution"].keys(): if Cnf.has_key("Suite::%s::CopyChanges" % (suite)): - utils.copy (pkg.changes_file, Cnf["Dir::RootDir"] + Cnf["Suite::%s::CopyChanges" % (suite)]); + utils.copy(pkg.changes_file, Cnf["Dir::RootDir"] + Cnf["Suite::%s::CopyChanges" % (suite)]); + # and the .katie file... + if Cnf.has_key("Suite::%s::CopyKatie" % (suite)): + utils.copy(Katie.pkg.changes_file[:-8]+".katie", Cnf["Suite::%s::CopyKatie" % (suite)]); projectB.query("COMMIT WORK"); @@ -377,8 +388,115 @@ def install (): if changes["architecture"].has_key("source"): Urgency_Logger.log(dsc["source"], dsc["version"], changes["urgency"]); + # Undo the work done in katie.py(accept) to help auto-building + # from accepted. + if Cnf.get("Dinstall::SpecialAcceptedAutoBuild") and \ + changes["distribution"].has_key("unstable"): + now_date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time())); + projectB.query("BEGIN WORK"); + for file in files.keys(): + dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"], file); + # Remove it from the list of packages for later processing by apt-ftparchive + projectB.query("UPDATE unstable_accepted SET in_accepted = 'f', last_used = '%s' WHERE filename = '%s'" % (now_date, dest)); + # Update the symlink to point to the new location in the pool + pool_location = utils.poolify (changes["source"], files[file]["component"]); + src = os.path.join(Cnf["Dir::PoolDir"], pool_location, os.path.basename(file)); + os.unlink(dest); + os.symlink(src, dest); + # Update last_used on any non-upload .orig.tar.gz symlink + if orig_tar_id: + # Determine the .orig.tar.gz file name + for dsc_file in dsc_files.keys(): + if dsc_file[-12:] == ".orig.tar.gz": + orig_tar_gz = os.path.join(Cnf["Dir::AcceptedAutoBuild"], dsc_file); + # Remove it from the list of packages for later processing by apt-ftparchive + projectB.query("UPDATE unstable_accepted SET in_accepted = 'f', last_used = '%s' WHERE filename = '%s'" % (now_date, orig_tar_gz)); + projectB.query("COMMIT WORK"); + + install_count = install_count + 1; + +################################################################################ + +def stable_install (summary, short_summary): + global install_count; + + print "Installing to stable."; + + # Begin a transaction; if we bomb out anywhere between here and the COMMIT WORK below, the DB will not be changed. + projectB.query("BEGIN WORK"); + + # Add the source to stable (and remove it from proposed-updates) + for file in files.keys(): + if files[file]["type"] == "dsc": + package = dsc["source"]; + version = dsc["version"]; # NB: not files[file]["version"], that has no epoch + q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)) + ql = q.getresult(); + if not ql: + utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s) in source table." % (package, version)); + source_id = ql[0][0]; + suite_id = db_access.get_suite_id('proposed-updates'); + projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id)); + suite_id = db_access.get_suite_id('stable'); + projectB.query("INSERT INTO src_associations (suite, source) VALUES ('%s', '%s')" % (suite_id, source_id)); + + # Add the binaries to stable (and remove it/them from proposed-updates) + for file in files.keys(): + if files[file]["type"] == "deb": + package = files[file]["package"]; + version = files[file]["version"]; + architecture = files[file]["architecture"]; + q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND b.architecture = a.id" % (package, version, architecture)); + ql = q.getresult(); + if not ql: + utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s for %s architecture) in binaries table." % (package, version, architecture)); + binary_id = ql[0][0]; + suite_id = db_access.get_suite_id('proposed-updates'); + projectB.query("DELETE FROM bin_associations WHERE suite = '%s' AND bin = '%s'" % (suite_id, binary_id)); + suite_id = db_access.get_suite_id('stable'); + projectB.query("INSERT INTO bin_associations (suite, bin) VALUES ('%s', '%s')" % (suite_id, binary_id)); + + projectB.query("COMMIT WORK"); + + utils.move (pkg.changes_file, Cnf["Dir::Morgue"] + '/katie/' + os.path.basename(pkg.changes_file)); + + ## Update the Stable ChangeLog file + new_changelog_filename = Cnf["Dir::RootDir"] + Cnf["Suite::Stable::ChangeLogBase"] + ".ChangeLog"; + changelog_filename = Cnf["Dir::RootDir"] + Cnf["Suite::Stable::ChangeLogBase"] + "ChangeLog"; + if os.path.exists(new_changelog_filename): + os.unlink (new_changelog_filename); + + new_changelog = utils.open_file(new_changelog_filename, 'w'); + 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: + new_changelog.write("stable/%s/source/%s\n" % (files[file]["component"], file)); + else: + new_changelog.write("%s\n" % (file)); + chop_changes = katie.re_fdnic.sub("\n", changes["changes"]); + new_changelog.write(chop_changes + '\n\n'); + if os.access(changelog_filename, os.R_OK) != 0: + changelog = utils.open_file(changelog_filename); + new_changelog.write(changelog.read()); + new_changelog.close(); + if os.access(changelog_filename, os.R_OK) != 0: + os.unlink(changelog_filename); + utils.move(new_changelog_filename, changelog_filename); + install_count = install_count + 1; + if not Options["No-Mail"] and changes["architecture"].has_key("source"): + Subst["__SUITE__"] = " into stable"; + Subst["__SUMMARY__"] = summary; + mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.installed","r").read()); + utils.send_mail(mail_message, ""); + Katie.announce(short_summary, 1) + + # Finally remove the .katie file + katie_file = os.path.join(Cnf["Suite::Proposed-Updates::CopyKatie"], os.path.basename(Katie.pkg.changes_file[:-8]+".katie")); + os.unlink(katie_file); + ################################################################################ def process_it (changes_file): @@ -394,9 +512,18 @@ def process_it (changes_file): # save and restore it. pkg.directory = os.getcwd(); + if installing_to_stable: + old = Katie.pkg.changes_file; + Katie.pkg.changes_file = os.path.basename(old); + os.chdir(Cnf["Suite::Proposed-Updates::CopyKatie"]); + Katie.init_vars(); Katie.update_vars(); Katie.update_subst(); + + if installing_to_stable: + Katie.pkg.changes_file = old; + check(); action(); @@ -406,7 +533,7 @@ def process_it (changes_file): ############################################################################### def main(): - global projectB, Logger, Urgency_Logger; + global projectB, Logger, Urgency_Logger, installing_to_stable; changes_files = init(); @@ -426,13 +553,17 @@ def main(): if not Options["No-Action"] and os.path.exists("%s/Archive_Maintenance_In_Progress" % (Cnf["Dir::RootDir"])) and not Options["No-Lock"]: utils.fubar("Archive maintenance in progress. Try again later."); - # Obtain lock if not in no-action mode and initialize the log + # If running from within proposed-updates; assume an install to stable + if string.find(os.getcwd(), 'proposed-updates') != -1: + installing_to_stable = 1; + # Obtain lock if not in no-action mode and initialize the log if not Options["No-Action"]: lock_fd = os.open(Cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT); fcntl.lockf(lock_fd, FCNTL.F_TLOCK); Logger = Katie.Logger = logging.Logger(Cnf, "katie"); - Urgency_Logger = Urgency_Log(Cnf); + if not installing_to_stable: + Urgency_Logger = Urgency_Log(Cnf); # Initialize the substitution template mapping global bcc = "X-Katie: %s" % (katie_version); @@ -459,8 +590,8 @@ def main(): if not Options["No-Action"]: Logger.close(); - Urgency_Logger.close(); + if not installing_to_stable: + Urgency_Logger.close(); if __name__ == '__main__': main() -