sync

diff --git a/TODO b/TODO
index d3e4e6ee6210973559b2d09ce259c00ed8bc1cad..8427b303b1680e1d14ece010b1fe79b1ed7d9a72 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,11 +1,3 @@
-<aj> ARRRGGGHHH
-<aj> what's wrong with me!?!?!?
-<aj> i was just nice to some mormon doorknockers!!!
-<Omnic> AJ?!?!
-<aj> i know!!!!!
-<Omnic> I'm gonna have to kick your ass when you come over
-<Culus> aj: GET THE HELL OUT OF THE CABAL! :P
-
 To fix
 ======
 
@@ -22,6 +14,8 @@ More Urgent
       table.  Then fix charisma to use them and write some scripting
       to handle the Santiago situation. ]
 
+  o katie can loop on rejects if target's exist in REJECT... 
+
 Less Urgent
 -----------
 
@@ -57,12 +51,10 @@ Less Urgent
     o Reject on misconfigured kernel-package uploads
     o denise abuses sys.stdout == badly  
     o utils.extract_component_from_section: main/utils -> main/utils, main rather than utils, main
-    o Fix katie to remove != stable on stable install, not just f + u
     o Fix katie to warn if run when not in incoming or p-u
     o check for empty debs; check for empty (or small (<1k ?)) .tar.gz's.
     o katie should validate multi-suite uploads; only possible valid one
       is "stable unstable"
-    o Don't do override checks for stable only uploads
     o cron.daily* should change umask (aj sucks)
     o Rene doesn't look at debian-installer but should.
     o Rene needs to check for binary-less source packages.
@@ -83,6 +75,14 @@ Less Urgent
     o jenna doesn't handle arch: any -> arch: all transitions 
       [aj worked around; need to revisit]
 
+ * Stable:
+
+<neuro> well, there's one other thing that doesn't work so well
+<neuro> you probably should have stable_install ignore Closes:
+<neuro> or it might be unique to the case of stable unstable uploads
+
+
+
 ===================================================================================================
 
 TODO
@@ -95,10 +95,6 @@ More Urgent
     unstable and source-ver ~= source-ver in testing; then map
     unstable -> testing-updates ?
 
-  o katie needs a stable_reject() which a) removes the package from
-    p-u, b) doesn't remove the file from the pool, and c) (optionally, I
-    guess) uses a template mail.
-
   o [Complexish] Secure incoming handling
   o [Hard] dependency checking (esp. stable)
   o Logging [mostly done]
@@ -112,6 +108,7 @@ Packaging
   o Install config file
   o Fix stuff to look in sensible places for libs and config file in debian package (?)
   o man pages and/or documentation
+  o debian/* assumes arch: all but sql-aptvc.o isn't arch: all.
 
 Less Urgent
 -----------
@@ -172,3 +169,5 @@ Less Urgent
      @ weekly postins to d-c (?)
      @ backup of report (?)
      @ backup of changes.tgz (?)
+
+------------------------------------------------

diff --git a/katie.conf b/katie.conf
index ed5a8c4e1ef85d91f56f6cd731479558e59f0ae5..cbce5bf6576b632ab6d4f81c352de29ee1ae4db9 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -14,6 +14,7 @@ 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>";
 };
 
 Julia

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 9f1ca56f385fa96a33ba049a75e5cdab43e3a370..407c358a2659e0d91560d81ee0d5950d188ea36c 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -14,9 +14,9 @@ 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>";
 };
 
-
 Shania
 {
   Options

diff --git a/templates/katie.stable-rejected b/templates/katie.stable-rejected
new file mode 100644 (file)
index 0000000..ae009b5
--- /dev/null
+++ b/templates/katie.stable-rejected
@@ -0,0 +1,18 @@
+From: __KATIE_ADDRESS__
+To: __MAINTAINER_TO__
+__CC__
+__BCC__
+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
+have been removed from proposed-updates and will be auto-cleaned as
+normal.

diff --git a/vars b/vars
index c7b2c8cd35fea09f4fe71c22b80d6d11a33e22a2..d3eb2fd2fdf9374a9436c7fc58b09fec39be1be9 100644 (file)
--- a/vars
+++ b/vars
@@ -14,7 +14,7 @@ incoming=/org/ftp.debian.org/incoming
 
 ftpgroup=debadmin
 
-copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src"
+copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free woody.extra.contrib woody.extra.main woody.extra.non-free"
 
 PATH=$masterdir:$PATH
 umask 022