]> git.decadent.org.uk Git - dak.git/blobdiff - katie.py
natalie moved to .py-less name
[dak.git] / katie.py
index 029c889e45654518327b15315792fbee7a2fa017..b2ac53a940b0e205d8da65346662a7683743f588 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.10 2002-03-06 07:39:24 rmurray Exp $
+# $Id: katie.py,v 1.17 2002-04-29 22:00:44 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
@@ -20,7 +20,7 @@
 
 ###############################################################################
 
-import cPickle, errno, os, pg, re, stat, string, sys, time;
+import cPickle, errno, os, pg, re, stat, string, sys, tempfile, time;
 import utils, db_access;
 import apt_inst, apt_pkg;
 
@@ -162,7 +162,8 @@ class Katie:
                    "maintainername", "maintaineremail", "closes" ]:
             d_changes[i] = changes[i];
         # Optional changes fields
-        for i in [ "changed-by", "maintainer822", "filecontents", "format" ]:
+        # FIXME: changes should be mandatory
+        for i in [ "changed-by", "maintainer822", "filecontents", "format", "changes" ]:
             if changes.has_key(i):
                 d_changes[i] = changes[i];
         ## dsc
@@ -287,6 +288,8 @@ class Katie:
 
             if action:
                 Subst["__ANNOUNCE_LIST_ADDRESS__"] = list;
+                if Cnf.get("Dinstall::TrackingServer") and changes["architecture"].has_key("source"):
+                    Subst["__ANNOUNCE_LIST_ADDRESS__"] = Subst["__ANNOUNCE_LIST_ADDRESS__"] + "\nBcc: %s@%s" % (changes["source"], Cnf["Dinstall::TrackingServer"])
                 mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/jennifer.announce","r").read());
                 utils.send_mail (mail_message, "")
 
@@ -356,6 +359,39 @@ class Katie:
             utils.send_mail(mail_message, "")
             self.announce(short_summary, 1)
 
+        # Special support to enable clean auto-building of accepted packages
+        if Cnf.get("Dinstall::SpecialAcceptedAutoBuild") and \
+           self.pkg.changes["distribution"].has_key("unstable"):
+            self.projectB.query("BEGIN WORK");
+            for file in file_keys:
+                src = os.path.join(Cnf["Dir::QueueAcceptedDir"], file);
+                dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"], file);
+                # Create a symlink to it
+                os.symlink(src, dest);
+                # Add it to the list of packages for later processing by apt-ftparchive
+                self.projectB.query("INSERT INTO unstable_accepted (filename, in_accepted) VALUES ('%s', 't')" % (dest));
+            # If the .orig.tar.gz is in the pool, create a symlink to
+            # it (if one doesn't already exist)
+            if self.pkg.orig_tar_id:
+                # Determine the .orig.tar.gz file name
+                for dsc_file in self.pkg.dsc_files.keys():
+                    if dsc_file[-12:] == ".orig.tar.gz":
+                        filename = dsc_file;
+                dest = os.path.join(Cnf["Dir::AcceptedAutoBuild"],filename);
+                # If it doesn't exist, create a symlink
+                if not os.path.exists(dest):
+                    # Find the .orig.tar.gz in the pool
+                    q = self.projectB.query("SELECT l.path, f.filename from location l, files f WHERE f.id = %s and f.location = l.id" % (self.pkg.orig_tar_id));
+                    ql = q.getresult();
+                    if not ql:
+                        utils.fubar("[INTERNAL ERROR] Couldn't find id %s in files table." % (self.pkg.orig_tar_id));
+                    src = os.path.join(ql[0][0], ql[0][1]);
+                    os.symlink(src, dest);
+                    # Add it to the list of packages for later processing by apt-ftparchive
+                    self.projectB.query("INSERT INTO unstable_accepted (filename, in_accepted) VALUES ('%s', 't')" % (dest));
+
+            self.projectB.query("COMMIT WORK");
+
     ###########################################################################
 
     def check_override (self):
@@ -416,7 +452,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,11 +463,40 @@ 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);
 
     ###########################################################################
 
     def do_reject (self, manual = 0, reject_message = ""):
+        # If we weren't given a manual rejection message, spawn an
+        # editor so the user can add one in...
+        if manual and not reject_message:
+            temp_filename = tempfile.mktemp();
+            fd = os.open(temp_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700);
+            os.close(fd);
+            editor = os.environ.get("EDITOR","vi")
+            answer = 'E';
+            while answer == 'E':
+                os.system("%s %s" % (editor, temp_filename))
+                file = utils.open_file(temp_filename);
+                reject_message = string.join(file.readlines());
+                file.close();
+                print "Reject message:";
+                print utils.prefix_multi_line_string(reject_message,"  ");
+                prompt = "[R]eject, Edit, Abandon, Quit ?"
+                answer = "XXX";
+                while string.find(prompt, answer) == -1:
+                    answer = utils.our_raw_input(prompt);
+                    m = re_default_answer.search(prompt);
+                    if answer == "":
+                        answer = m.group(1);
+                    answer = string.upper(answer[:1]);
+            os.unlink(temp_filename);
+            if answer == 'A':
+                return 1;
+            elif answer == 'Q':
+                sys.exit(0);
+
         print "Rejecting.\n"
 
         Cnf = self.Cnf;
@@ -471,20 +536,12 @@ class Katie:
             os.write(fd, reject_mail_message);
             os.close(fd);
 
-            # If we weren't given a manual rejection message, spawn an
-            # editor so the user can add one in...
-            if reject_message == "":
-                editor = os.environ.get("EDITOR","vi")
-                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"]:
             utils.send_mail (reject_mail_message, "");
 
         self.Logger.log(["rejected", pkg.changes_file]);
+        return 0;
 
     ################################################################################