X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie;h=31553ec5e781e5ae453e341337326dad55f47b1d;hb=efed042a00ba9dd5ff54fcf59773dffe0959df1b;hp=410871dd52e9f4d93036f936a41aece962b27c29;hpb=2d4b390c184bd59d3cf0904ce0a1b6b9ac268fe9;p=dak.git diff --git a/katie b/katie index 410871dd..31553ec5 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packaes # Copyright (C) 2000, 2001 James Troup -# $Id: katie,v 1.34 2001-03-21 05:37:23 troup Exp $ +# $Id: katie,v 1.36 2001-04-03 10:01:08 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 @@ -626,16 +626,18 @@ def check_override (): def update_subst (changes_filename): global Subst; - + if changes.has_key("architecture"): Subst["__ARCHITECTURE__"] = string.join(changes["architecture"].keys(), ' ' ); + else: + Subst["__ARCHITECTURE__"] = "Unknown"; Subst["__CHANGES_FILENAME__"] = os.path.basename(changes_filename); - Subst["__FILE_CONTENTS__"] = changes.get("filecontents"); + Subst["__FILE_CONTENTS__"] = changes.get("filecontents", ""); Subst["__MAINTAINER_ADDRESS__"] = changes["maintainer822"]; - Subst["__MAINTAINER__"] = changes.get("maintainer"); + Subst["__MAINTAINER__"] = changes.get("maintainer", "Unknown"); Subst["__REJECT_MESSAGE__"] = reject_message; - Subst["__SOURCE__"] = changes.get("source"); - Subst["__VERSION__"] = changes.get("version"); + Subst["__SOURCE__"] = changes.get("source", "Unknown"); + Subst["__VERSION__"] = changes.get("version", "Unknown"); ##################################################################################################################### @@ -958,7 +960,7 @@ def stable_install (changes_filename, summary, short_summary): install_count = install_count + 1; if not Cnf["Dinstall::Options::No-Mail"]: - Subst["__SUITE__"] = "into stable"; + Subst["__SUITE__"] = " into stable"; Subst["__SUMMARY__"] = summary; utils.send_mail (mail_message, "") announce (short_summary, 1) @@ -1228,7 +1230,7 @@ def main(): Subst = {} Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"]; - bcc = "X-Katie: $Revision: 1.34 $" + bcc = "X-Katie: $Revision: 1.36 $" if Cnf.has_key("Dinstall::Bcc"): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]); else: