Add lauren

docs/README.first

@@ -76,6 +76,7 @@ o amber - wrapper for Debian security team
 o halle - removes obsolete .changes files from proposed-updates
 o jeri - basic dependency checking for proposed-updates
 o emilie - syncs fingerprint and uid information with a debian.org LDAP DB
+o lauren - manually reject packages from proposed-updates
 
 Very Incomplete or otherwise not generally useful
 -------------------------------------------------

docs/README.names

@@ -18,6 +18,7 @@ jeri - basic dependency checking for proposed-updates
 julia - Sync PostgreSQL users with (LDAP-generated) passwd file
 katie - common code used by lisa, jennifer, kelly and others
 kelly - installs packages into the pool
+lauren - manually reject packages from proposed-updates
 lisa - processes NEW and BYHAND packages
 madison - shows which suites a package is in
 melanie - removes packages from suites
@@ -35,10 +36,10 @@ With apologies to Alyson Hannigan, Amber Benson, Andrea Corr, Ashley
  Judd, Catherine Zeta Jones, Charisma Carpenter, Cindy Crawford,
  Claire Forlani, Denise Richards, Emilie de Ravin, Fernanda Tavares,
  Halle Berry, Heidi Klum, Helena Christensen, Jenna Elfman, Jennifer
- Lopez, Jeri Ryan, Julia Roberts, Katie Holmes, Kelly Brook, Lisa
- Falkner, Madison Michele, Melanie Sykes, Natalie Portman, Neve
- Campbell, Rene O'Connor, Rose McGowan, Rhona Mitra, Saffron Burrows,
- Shania Twain, Tea Leoni and Ziyi Zhang.
+ Lopez, Jeri Ryan, Julia Roberts, Katie Holmes, Kelly Brook, Lauren
+ Lee Smith, Lisa Falkner, Madison Michele, Melanie Sykes, Natalie
+ Portman, Neve Campbell, Rene O'Connor, Rose McGowan, Rhona Mitra,
+ Saffron Burrows, Shania Twain, Tea Leoni and Ziyi Zhang.
 
 In Use Elsewhere:
 -----------------
@@ -95,7 +96,6 @@ Kim (Smith)
 Kirsten (Dunst)
 Kristin (Kreuk)
 Kylie (Minogue)
-Lauren (Lee Smith)
 Mariska (Hargitay)
 Michelle (Hunziker)
 Mira (Sorvino)

katie.conf

@@ -16,7 +16,6 @@ Dinstall
    LockFile "/org/ftp.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -75,6 +74,12 @@ Neve
   ExportDir "/org/ftp.debian.org/katie/neve-files/";
 };
 
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r1/";
+};
+
 Emilie
 {
   LDAPDn "ou=users,dc=debian,dc=org";

katie.conf-non-US

@@ -16,7 +16,6 @@ Dinstall
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
    SkipTime 300;
@@ -26,6 +25,12 @@ Dinstall
    StableDislocationSupport "false";
 };
 
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r1/";
+};
+
 Julia
 {
   ValidGID "800";

lauren

+#!/usr/bin/env python
+
+# Manually reject packages for proprosed-updates
+# Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: lauren,v 1.1 2003-02-21 19:18:05 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import os, pg, sys, tempfile;
+import db_access, katie, logging, utils;
+import apt_pkg;
+
+################################################################################
+
+# Globals
+lauren_version = "$Revision: 1.1 $";
+
+Cnf = None;
+Options = None;
+projectB = None;
+Katie = None;
+Logger = None;
+
+################################################################################
+
+def usage(exit_code=0):
+    print """Usage: lauren .CHANGES[...]
+Manually reject the .CHANGES file(s).
+
+  -h, --help                show this help and exit.
+  -m, --message=MSG         use this message for the rejection.
+  -s, --no-mail             don't send any mail."""
+    sys.exit(exit_code)
+
+################################################################################
+
+def main():
+    global Cnf, Logger, Options, projectB, Katie;
+
+    Cnf = utils.get_conf();
+    Arguments = [('h',"help","Lauren::Options::Help"),
+                 ('m',"manual-reject","Lauren::Options::Manual-Reject", "HasArg"),
+                 ('s',"no-mail", "Lauren::Options::No-Mail")];
+    for i in [ "help", "manual-reject", "no-mail" ]:
+	if not Cnf.has_key("Lauren::Options::%s" % (i)):
+	    Cnf["Lauren::Options::%s" % (i)] = "";
+
+    arguments = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv);
+
+    Options = Cnf.SubTree("Lauren::Options");
+    if Options["Help"]:
+	usage();
+    if not arguments:
+        utils.fubar("need at least one .changes filename as an argument.");
+
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
+    db_access.init(Cnf, projectB);
+
+    Katie = katie.Katie(Cnf);
+    Logger = Katie.Logger = logging.Logger(Cnf, "lauren");
+
+    bcc = "X-Katie: lauren %s" % (lauren_version);
+    if Cnf.has_key("Dinstall::Bcc"):
+        Katie.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
+    else:
+        Katie.Subst["__BCC__"] = bcc;
+
+    for arg in arguments:
+        arg = utils.validate_changes_file_arg(arg);
+        Katie.pkg.changes_file = arg;
+	Katie.init_vars();
+        cwd = os.getcwd();
+        os.chdir(Cnf["Suite::Proposed-Updates::CopyKatie"]);
+        Katie.update_vars();
+        os.chdir(cwd);
+        Katie.update_subst();
+
+        print arg
+        done = 0;
+        prompt = "Manual reject, [S]kip, Quit ?";
+        while not done:
+            answer = "XXX";
+
+            while prompt.find(answer) == -1:
+                answer = utils.our_raw_input(prompt);
+                m = katie.re_default_answer.search(prompt);
+                if answer == "":
+                    answer = m.group(1)
+                answer = answer[:1].upper()
+
+            if answer == 'M':
+                aborted = reject(Options["Manual-Reject"]);
+                if not aborted:
+                    done = 1;
+            elif answer == 'S':
+                done = 1;
+            elif answer == 'Q':
+                sys.exit(0)
+
+    Logger.close();
+
+################################################################################
+
+def reject (reject_message = ""):
+    files = Katie.pkg.files;
+    dsc = Katie.pkg.dsc;
+    changes_file = Katie.pkg.changes_file;
+
+    # If we weren't given a manual rejection message, spawn an editor
+    # so the user can add one in...
+    if 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 = "".join(file.readlines());
+            file.close();
+            print "Reject message:";
+            print utils.prefix_multi_line_string(reject_message,"  ", include_blank_lines=1);
+            prompt = "[R]eject, Edit, Abandon, Quit ?"
+            answer = "XXX";
+            while prompt.find(answer) == -1:
+                answer = utils.our_raw_input(prompt);
+                m = katie.re_default_answer.search(prompt);
+                if answer == "":
+                    answer = m.group(1);
+                answer = answer[:1].upper();
+        os.unlink(temp_filename);
+        if answer == 'A':
+            return 1;
+        elif answer == 'Q':
+            sys.exit(0);
+
+    print "Rejecting.\n"
+
+    # Reject the .changes file
+    Katie.force_reject([changes_file]);
+
+    # Setup the .reason file
+    reason_filename = changes_file[:-8] + ".reason";
+    reject_filename = Cnf["Dir::Queue::Reject"] + '/' + reason_filename;
+
+    # If we fail here someone is probably trying to exploit the race
+    # so let's just raise an exception ...
+    if os.path.exists(reject_filename):
+         os.unlink(reject_filename);
+    reject_fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644);
+
+    # Build up the rejection email
+    user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"]);
+
+    Katie.Subst["__REJECTOR_ADDRESS__"] = user_email_address;
+    Katie.Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message;
+    Katie.Subst["__STABLE_REJECTOR__"] = Cnf["Lauren::StableRejector"];
+    Katie.Subst["__MORE_INFO_URL__"] = Cnf["Lauren::MoreInfoURL"];
+    Katie.Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"];
+    reject_mail_message = utils.TemplateSubst(Katie.Subst,Cnf["Dir::Templates"]+"/lauren.stable-rejected");
+
+    # Write the rejection email out as the <foo>.reason file
+    os.write(reject_fd, reject_mail_message);
+    os.close(reject_fd);
+
+    # Remove the packages from proposed-updates
+    suite_id = db_access.get_suite_id('proposed-updates');
+
+    projectB.query("BEGIN WORK");
+    # Remove files from proposed-updates suite
+    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("reject: Couldn't find %s_%s in source table." % (package, version));
+            source_id = ql[0][0];
+            projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id));
+        elif 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("reject: Couldn't find %s_%s_%s in binaries table." % (package, version, architecture));
+            binary_id = ql[0][0];
+            projectB.query("DELETE FROM bin_associations WHERE suite = '%s' AND bin = '%s'" % (suite_id, binary_id));
+    projectB.query("COMMIT WORK");
+
+    # Send the rejection mail if appropriate
+    if not Options["No-Mail"]:
+        utils.send_mail (reject_mail_message, "");
+
+    # Finally remove the .katie file
+    katie_file = os.path.join(Cnf["Suite::Proposed-Updates::CopyKatie"], os.path.basename(changes_file[:-8]+".katie"));
+    os.unlink(katie_file);
+
+    Logger.log(["rejected", changes_file]);
+    return 0;
+
+################################################################################
+
+if __name__ == '__main__':
+    main();

templates/katie.stable-rejected → templates/lauren.stable-rejected

@@ -5,15 +5,22 @@ __BCC__
 Precedence: bulk
 Subject: __CHANGES_FILENAME__ REJECTED from proposed-updates
 
-__MANUAL_REJECT_MESSAGE__
-__REJECT_MESSAGE__
-
-===
-
 Your package was rejected by an ftp master on behalf of
 __STABLE_REJECTOR__, if you have any questions or comments regarding
 this rejection, please address them to him as we can't help you.
 
-Your rejected .changes files is in incoming/REJECT/; the other files
+The reason given for rejection was:
+
+__MANUAL_REJECT_MESSAGE__
+
+Please see:
+
+   __MORE_INFO_URL__
+
+for more details.
+
+===
+
+Your rejected .changes files is in queue/REJECT/; the other files
 have been removed from proposed-updates and will be auto-cleaned as
 normal.