(no commit message)

[dak.git] / katie.py

diff --git a/katie.py b/katie.py
index 3c9f9b0ff0ade06ce7aaf3357f4096d589e9041f..876e2f37bf6117a09a54a57b018bb7a54601bcb1 100644 (file)
--- a/katie.py
+++ b/katie.py
@@ -2,7 +2,7 @@
 
 # Utility functions for katie
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.8 2002-02-22 22:49:14 troup Exp $
+# $Id: katie.py,v 1.11 2002-03-14 14:12:04 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
@@ -416,7 +416,7 @@ class Katie:
                         # someone is trying to exploit us.
                         utils.warn("**WARNING** failed to move %s from the reject directory to the morgue." % (file));
                         return;
-                    utils.move(dest_file, morgue_file);
+                    utils.move(dest_file, morgue_file, perms=0660);
                     try:
                         os.open(dest_file, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644);
                     except OSError, e:
@@ -427,7 +427,8 @@ class Katie:
                     raise;
             # If we got here, we own the destination file, so we can
             # safely overwrite it.
-            utils.move(file, dest_file, 1);
+            utils.move(file, dest_file, 1, perms=0660);
+
 
     ###########################################################################
 
@@ -457,6 +458,7 @@ class Katie:
             Subst["__CC__"] = "X-Katie-Rejection: automatic (moo)";
             os.write(fd, reject_message);
             os.close(fd);
+            reject_mail_message = utils.TemplateSubst(Subst,utils.open_file(Cnf["Dir::TemplatesDir"]+"/katie.rejected").read());
         else:
             # Build up the rejection email
             user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]);
@@ -477,10 +479,10 @@ class Katie:
                 result = os.system("%s +6 %s" % (editor, reject_filename))
                 if result != 0:
                     utils.fubar("editor invocation failed for '%s'!" % (reject_filename), result);
+               reject_mail_message = utils.open_file(reject_filename).read();
 
         # Send the rejection mail if appropriate
         if not Cnf["Dinstall::Options::No-Mail"]:
-            reject_mail_message = utils.TemplateSubst(Subst,utils.open_file(Cnf["Dir::TemplatesDir"]+"/katie.rejected").read());
             utils.send_mail (reject_mail_message, "");
 
         self.Logger.log(["rejected", pkg.changes_file]);
@@ -615,12 +617,12 @@ class Katie:
         dsc_files = self.pkg.dsc_files;
         legacy_source_untouchable = self.pkg.legacy_source_untouchable;
         orig_tar_gz = None;
-        found = None;
 
         # Try and find all files mentioned in the .dsc.  This has
         # to work harder to cope with the multiple possible
         # locations of an .orig.tar.gz.
         for dsc_file in dsc_files.keys():
+            found = None;
             if files.has_key(dsc_file):
                 actual_md5 = files[dsc_file]["md5sum"];
                 actual_size = int(files[dsc_file]["size"]);