sync

diff --git a/TODO b/TODO
index 3413a5178acac8c002b84815df6882da4d677b04..c3d67a5b6548c076d131979ab6ad7e75acdb4639 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,6 +10,11 @@ Actually Urgent
 
 More Urgent
 -----------
+ 
+  o db_access.get_location_id should handle the lack of archive_id properly
+
+  o security.debian.org: BYHAND auto-uploading doesn't work
+  o security.debian.org: BYHAND auto-uploading assumes ftp-master
 
   o lisa doesn't do the right thing with -2 and -1 uploads, as you can
     end up with the .orig.tar.gz not in the pool

diff --git a/cron.weekly b/cron.weekly
index a86caac260e8847de421ef1ada1e8bb5d8d95957..18d4162b6cb56de09899d916aaad474b64edfd6e 100755 (executable)
--- a/cron.weekly
+++ b/cron.weekly
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Run once a week via cron, out of troup's crontab.
+# Run once a week via cron, out of katie's crontab.
 
 set -e
 export SCRIPTVARS=/org/ftp.debian.org/katie/vars
@@ -8,14 +8,10 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 
 ################################################################################
 
-# Clean out incoming
-
-shania
-
 # Purge empty directories
 
-if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then 
-   find $ftpdir/pool/ -type d -empty | xargs rmdir; 
+if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then
+   find $ftpdir/pool/ -type d -empty | xargs rmdir;
 fi
 
 # Clean up apt-ftparchive's databases

diff --git a/docs/README.names b/docs/README.names
index 5c03c612fe06d6b3367d58287fd64ede52f24b5a..12f7ef3cbfa7f641c41d55cec5ff81c2361eb047 100644 (file)
--- a/docs/README.names
+++ b/docs/README.names
@@ -1,6 +1,8 @@
-ashley - display the contents of a .katie file
 alyson - sync's the ISC-style configuration file with the SQL DB
+amber - 'installer' wrapper for security team
 andrea - looks for fixable descrepancies between stable and unstable
+ashley - display the contents of a .katie file
+cameron - generate file list for unstable_accepted
 catherine - poolifies packages; i.e. moves them from legacy dists/ locations into the pool
 charisma - generates Maintainers files used by e.g. the Debian BTS
 claire - generates compatability symlink tree for legacy dists/ locations
@@ -24,50 +26,62 @@ shania - cleans cruft from incoming
 tea - sanity checks the database
 ziyi - creates Release files
 
-With apologies to Ashley Judd, Alyson Hannigan, Andrea Corr, Catherine
- Zeta Jones, Charisma Carpenter, Claire Forlani, Fernanda Tervares,
- Halle Berry, Heidi Klum, Jenna Elfman, Jennifer Lopez, Jeri Ryan,
- Julia Roberts, Katie Holmes, Lisa Falkner, Madison Michele, Melanie
- Sykes, Natalie Portman, Neve Campbell, Rene O'Connor, Rhona Mitra,
- Saffron Burrows, Shania Twain, Tea Leoni and Ziyi Zhang.
+With apologies to Alyson Hannigan, Amber Benson, Andrea Corr, Ashley
+ Judd, Catherine Zeta Jones, Cameron Diaz, Charisma Carpenter, Claire
+ Forlani, Fernanda Tervares, Halle Berry, Heidi Klum, Jenna Elfman,
+ Jennifer Lopez, Jeri Ryan, Julia Roberts, Katie Holmes, Lisa Falkner,
+ Madison Michele, Melanie Sykes, Natalie Portman, Neve Campbell, Rene
+ O'Connor, Rhona Mitra, Saffron Burrows, Shania Twain, Tara Reid, Tea
+ Leoni and Ziyi Zhang.
+
+In Use Elsewhere:
+-----------------
+
+Christina (Aguilera)   [lene]
+Emily (Mortimer)       [lene]
+Lene (Nystrom)         [lene]
+Lonneke (Engel)                [lene]
+Louise (Nurding)       [lene]
+
+Britney (Spears)       [aj]
+
+Michelle (Yeoh)                [joey]
+Courtney (Cox)         [neuro]
+Sandra (Bullock)       [neuro]
 
 Possible Future Candidates:
 ---------------------------
 
+Alicia (Witt)
+Angelina (Jolie)
 Billie (Piper)
-Cameron (Diaz)
+Carly (Pope)
+Carrie (Ann Moss)
 Emma (Thompson)
 Elisabeth (Shue)
 Eliza (Dushku)
+Famke (Janssen)
 Gail (Porter)
+Gillian (Anderson)
 Gwyneth (Paltrow)
 Heather (Graham)
+Helena (Christensen)
+Jessica (Alba)
 Jewel (Kilcher)
 Kari (Wuhrer)
 Kelly (Brook)
 Kim (Smith)
+Kirsten (Dunst)
 Lucy (Liu)
 Michelle (Hunziker)
 Rebecca (Romijn-Stamos)
 Reese (Witherspoon)
 Rose (McGowan)
 Salma (Hayek)
+Shannen (Doherty)
 Sophie (Marceau)
 Tara (Reid)
 Teri (Hatcher)
 Tiffani (Amber Thiesen)
 Virgine (Leoyden)
 
-Already Used Elsewhere:
------------------------
-
-Christina (Aguilera)   [lene]
-Emily (Mortimer)       [lene]
-Lene (Nystrom)         [lene]
-Lonneke (Engel)                [lene]
-Louise (Nurding)       [lene]
-
-Michelle (Yeoh)                [joey]
-Britney (Spears)       [aj]
-Sandra (Bullock)       [neuro]
-Courtney (Cox)         [neuro]