From 0ac00b66f877a83e63362b7d7177c6d5428b5f47 Mon Sep 17 00:00:00 2001 From: James Troup Date: Wed, 17 May 2006 13:40:47 -0500 Subject: [PATCH] Convert away from silly names --- .cvsignore | 4 - docs/.cvsignore | 2 - docs/README.names | 150 ------------------ docs/README.suite-removal | 82 ---------- templates/README | 7 +- .../{alicia.bug-close => override.bug-close} | 2 +- ...lly.installed => process-accepted.install} | 2 +- ...lly.unaccept => process-accepted.unaccept} | 2 +- ...ification => process-new.bxa_notification} | 0 templates/{lisa.prod => process-new.prod} | 0 ...er.accepted => process-unchecked.accepted} | 2 +- ...er.announce => process-unchecked.announce} | 0 ....bug-close => process-unchecked.bug-close} | 0 ... process-unchecked.bug-experimental-fixed} | 0 ...-fixed => process-unchecked.bug-nmu-fixed} | 0 .../{jennifer.new => process-unchecked.new} | 2 +- ...y => process-unchecked.override-disparity} | 2 +- templates/{katie.rejected => queue.rejected} | 0 ...ected => reject-proposed-updates.rejected} | 2 +- templates/{melanie.bug-close => rm.bug-close} | 2 +- ...ber.advisory => security-install.advisory} | 4 +- 21 files changed, 14 insertions(+), 251 deletions(-) delete mode 100644 .cvsignore delete mode 100644 docs/.cvsignore delete mode 100644 docs/README.names delete mode 100644 docs/README.suite-removal rename templates/{alicia.bug-close => override.bug-close} (95%) rename templates/{kelly.installed => process-accepted.install} (88%) rename templates/{kelly.unaccept => process-accepted.unaccept} (89%) rename templates/{lisa.bxa_notification => process-new.bxa_notification} (100%) rename templates/{lisa.prod => process-new.prod} (100%) rename templates/{jennifer.accepted => process-unchecked.accepted} (88%) rename templates/{jennifer.announce => process-unchecked.announce} (100%) rename templates/{jennifer.bug-close => process-unchecked.bug-close} (100%) rename templates/{jennifer.bug-experimental-fixed => process-unchecked.bug-experimental-fixed} (100%) rename templates/{jennifer.bug-nmu-fixed => process-unchecked.bug-nmu-fixed} (100%) rename templates/{jennifer.new => process-unchecked.new} (94%) rename templates/{jennifer.override-disparity => process-unchecked.override-disparity} (97%) rename templates/{katie.rejected => queue.rejected} (100%) rename templates/{lauren.stable-rejected => reject-proposed-updates.rejected} (95%) rename templates/{melanie.bug-close => rm.bug-close} (98%) rename templates/{amber.advisory => security-install.advisory} (96%) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 48871145..00000000 --- a/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.pyc -Packages -Sources -neve-files diff --git a/docs/.cvsignore b/docs/.cvsignore deleted file mode 100644 index 151d0f8d..00000000 --- a/docs/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -manpage.* -*.1 diff --git a/docs/README.names b/docs/README.names deleted file mode 100644 index 3c773bc5..00000000 --- a/docs/README.names +++ /dev/null @@ -1,150 +0,0 @@ -alicia - make microchanges or microqueries of the overrides -alyson - syncs 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 -billie - split a pool/ftp-site/whatever by architecture groups -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 -cindy - override cruft checker -claire - generates compatability symlink tree for legacy dists/ locations [obsolete] -denise - outputs the override tables to text files -emilie - syncs fingerprint and uid tables with a Debian LDAP DB -fernanda - checker script for new packages in incoming -halle - removes obsolete .changes files from proposed-updates -heidi - manipulates suite tags; i.e. removes/adds packages from any given suite -helena - produces a report on NEW and BYHAND packages -jenna - generates lists of files in suites which are then fed to apt-ftparchive -jennifer - processes packages in incoming -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 -natalie - manpiulates/list override entries -neve - populates the SQL database -nina - split queue/done into a date-based directory structure -rene - check for obsolete or duplicated packages -rose - initial setup of an archive -rosamund - check for users with no packages in the archive -rhona - cleans unused/superseded packages out of the pool and the database -saffron - stats pr0n generator -shania - cleans cruft from incoming -tea - various sanity checks of the database and archive -ziyi - creates Release files - -With apologies to Alicia Silverstone, 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, Lauren Lee Smith, Lisa Falkner, Madison Michele, Melanie Sykes, - Natalie Portman, Neve Campbell, Nina Garbiras, Rene Russo, Rosamund Pike, Rose - McGowan, Rhona Mitra, Saffron Burrows, Shania Twain, 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] - -Linda (Evangelista) [python lintian] -Jane (Fonda) [linda over the entire archive] -Lucy (Lawless) [files from jane -> html] - -Kate (Hudson, Beckinsale, Winslet) [kde text editor] - -Amanda (Peet) [Backup software] - -Canonical Names ---------------- - -Anastacia -Bridget (Hall) -Geri (Haliwell) -Kari (Wuhrer) -Heather (Graham) -Hilarie (Burton) -Lorraine (Van Wyk) -Poppy (Montgomery) -Teri (Hatcher) - - Possible Future Candidates - ========================== - -Alessandra (Ambrosia) -Alyssa (Milliano) -Amy (Brenneman) -Angelina (Jolie) -Bethany (Joy Lenz) -Billie (Piper) -Cameron (Diaz) -Carly (Pope) -Carrie (Ann Moss) -Charlize (Theron) -Daniela (Pestova) -Dannii (Minogue) -Dido -Donna (Air) -Elisabeth (Shue) -Elisha (Cuthbert) -Eliza (Dushku) -Estella (Warren) -Emma (Caulfield) -Famke (Janssen) -Gail (Porter) -Gillian (Anderson) -Gina (Gershon) -Gwyneth (Paltrow) -Holly (Marie Combs) -Janel (Moloney) -Jessica (Alba, Biel) -Jewel (Kilcher) -Jill (Hennessy) -Josie (Maran) -Katherine (Heigl) -Kim (Smith) -Kirsten (Dunst) -Kristin (Kreuk) -Kylie (Minogue) -Laetitia (Casta) -Lana (Parrilla) -Liv (Tyler) -Marcia (Cross) -Mariska (Hargitay) -Michelle (Hunziker) -Mira (Sorvino) -Monica (Belluci) -Naima (Belkhiati) -Nicole (Appleton) -Rebecca (Romijn-Stamos) -Reese (Witherspoon) -Salma (Hayek) -Sarah (Whatmore) -Shannen (Doherty) -Shiri (Appleby) -Sophia (Bush) -Sophie (Marceau) -Stephanie (March) -Suzanne (Cryer) -Tara (Reid) -Tasha (Tilberg) -Tiffani (Amber Thiesen) -Tricia (Helfer) -Uma (Thurman) -Veronica (Varekova) -Virginie (Leoyden) -Yamila (Diaz) diff --git a/docs/README.suite-removal b/docs/README.suite-removal deleted file mode 100644 index 417431d8..00000000 --- a/docs/README.suite-removal +++ /dev/null @@ -1,82 +0,0 @@ -[ This was some notes to myself that I made while removing potato; I - kept it because it turned out to be a far more traumatic experience - than was necesary. Hopefully rhona will be fixed by the time I need - to do this again which would obsolete most of the complex SQL - crap. (JT) ] - - - Potato Removal Plan - ------------------- - -o Create potato copy on archive.debian.org -o poolize any not-just-potato files with monica. -o force-remove any just-potato files (i.e. by setting last used to 3 weeks ago and run rhona) -o remove any files (dists/potato) (NB: not pool symlinks!) -o remove oldstable etc. from the db and config files - -******************************************************************************** -DROP TABLE moo; - -SELECT f.id INTO TEMP moo FROM files f, binaries b, bin_associations ba - WHERE ba.suite IN (2, 3) AND ba.bin = b.id AND f.id = b.file -EXCEPT -SELECT f.id FROM files f, binaries b, bin_associations ba - WHERE ba.suite NOT IN (2, 3) AND ba.bin = b.id AND f.id = b.file; - -CREATE INDEX moo_index on moo (id); -VACUUM; VACUUM ANALYZE; - -EXPLAIN UPDATE files set last_used = '2003/09/03' - WHERE EXISTS ( - SELECT id FROM moo WHERE files.id = moo.id); - -DELeditmeETE FROM bin_associations WHERE suite IN (2, 3); - -[ run rhona ] - -**************************************** - -DROP TABLE moo; - -SELECT f.id INTO TEMP moo FROM files f, source s, src_associations sa, dsc_files df - WHERE sa.suite IN (2, 3) AND sa.source = s.id AND df.source = s.id AND df.file = f.id - AND NOT EXISTS (SELECT b.id FROM binaries b WHERE b.source = s.id) -EXCEPT -SELECT f.id FROM files f, source s, src_associations sa, dsc_files df - WHERE sa.suite NOT IN (2, 3) AND sa.source = s.id AND df.source = s.id AND df.file = f.id; - -CREATE INDEX moo_index on moo (id); -VACUUM; VACUUM ANALYZE; - -EXPLAIN UPDATE files set last_used = '2003/09/03' - WHERE EXISTS ( - SELECT id FROM moo WHERE files.id = moo.id); - -DELeditmeETE FROM src_associations WHERE suite IN (2, 3); - -[ run rhona ] - -******************************************************************************** - -[Code for catherine (poolize); to go after the move of the file] -# Create symlink -src = utils.clean_symlink(destination, legacy_filename, Cnf["Dir::Root"]); -if verbose: - print "Symlinking: %s -> %s" % (legacy_filename, src); -if not no_action: - os.symlink(src, legacy_filename); - - -[Query for catherine] -SELECT l.path, f.filename, f.id as files_id, c.name as component - FROM files f, binaries b, bin_associations ba, location l, component c - WHERE ba.suite NOT IN (2, 3) AND f.filename ~ '^potato' - AND ba.bin = b.id AND f.id = b.file AND l.id = f.location - AND c.id = l.component -UNION -SELECT DISTINCT ON (f.filename) l.path, f.filename, f.id as files_id, c.name as component - FROM files f, source s, src_associations sa, dsc_files df, - location l, component c - WHERE sa.suite NOT IN (2, 3) AND f.filename ~ '^potato' - AND sa.source = s.id AND df.source = s.id AND f.id = df.file - AND l.id = f.location AND c.id = l.component; diff --git a/templates/README b/templates/README index 6d256230..4ad32d91 100644 --- a/templates/README +++ b/templates/README @@ -1,5 +1,5 @@ -Currently used substitutions in katie: -====================================== +Currently used substitutions in dak +=================================== Global ------ @@ -8,7 +8,7 @@ Global o __BCC__ [*] o __BUG_SERVER__ o __DISTRO__ - o __KATIE_ADDRESS__ + o __DAK_ADDRESS__ Per package ----------- @@ -24,6 +24,7 @@ Per package Misc ---- + o __ANNOUNCE_LIST_ADDRESS__ o __BUG_NUMBER__ o __CONTROL_MESSAGE__ diff --git a/templates/alicia.bug-close b/templates/override.bug-close similarity index 95% rename from templates/alicia.bug-close rename to templates/override.bug-close index 63c00f0a..eb9d7071 100644 --- a/templates/alicia.bug-close +++ b/templates/override.bug-close @@ -1,4 +1,4 @@ -From: __ALICIA_ADDRESS__ +From: __OVERRIDE_ADDRESS__ To: __BUG_NUMBER__-close@__BUG_SERVER__ __CC__ __BCC__ diff --git a/templates/kelly.installed b/templates/process-accepted.install similarity index 88% rename from templates/kelly.installed rename to templates/process-accepted.install index 2075e7fe..71c4da5c 100644 --- a/templates/kelly.installed +++ b/templates/process-accepted.install @@ -1,4 +1,4 @@ -From: __KATIE_ADDRESS__ +From: __DAK_ADDRESS__ To: __MAINTAINER_TO__ __BCC__ Precedence: bulk diff --git a/templates/kelly.unaccept b/templates/process-accepted.unaccept similarity index 89% rename from templates/kelly.unaccept rename to templates/process-accepted.unaccept index f2e46bb3..d8115673 100644 --- a/templates/kelly.unaccept +++ b/templates/process-accepted.unaccept @@ -11,7 +11,7 @@ __REJECT_MESSAGE__ Despite being ACCEPTed, this package failed the database sanity checks at the time of install. This should only happen rarely and in corner-cases (a binary upload of a package which has since been -melanie'd for example), so no code to do the necessary unaccept +'dak rm'-d for example), so no code to do the necessary unaccept actions has been written. These actions (e.g. bug reopening, announcement rescinding, etc.) will have to be done by hand. Also, the files have been left in the accepted directory; please deal with diff --git a/templates/lisa.bxa_notification b/templates/process-new.bxa_notification similarity index 100% rename from templates/lisa.bxa_notification rename to templates/process-new.bxa_notification diff --git a/templates/lisa.prod b/templates/process-new.prod similarity index 100% rename from templates/lisa.prod rename to templates/process-new.prod diff --git a/templates/jennifer.accepted b/templates/process-unchecked.accepted similarity index 88% rename from templates/jennifer.accepted rename to templates/process-unchecked.accepted index c84029a4..c444501b 100644 --- a/templates/jennifer.accepted +++ b/templates/process-unchecked.accepted @@ -1,4 +1,4 @@ -From: __KATIE_ADDRESS__ +From: __DAK_ADDRESS__ To: __MAINTAINER_TO__ __BCC__ Precedence: bulk diff --git a/templates/jennifer.announce b/templates/process-unchecked.announce similarity index 100% rename from templates/jennifer.announce rename to templates/process-unchecked.announce diff --git a/templates/jennifer.bug-close b/templates/process-unchecked.bug-close similarity index 100% rename from templates/jennifer.bug-close rename to templates/process-unchecked.bug-close diff --git a/templates/jennifer.bug-experimental-fixed b/templates/process-unchecked.bug-experimental-fixed similarity index 100% rename from templates/jennifer.bug-experimental-fixed rename to templates/process-unchecked.bug-experimental-fixed diff --git a/templates/jennifer.bug-nmu-fixed b/templates/process-unchecked.bug-nmu-fixed similarity index 100% rename from templates/jennifer.bug-nmu-fixed rename to templates/process-unchecked.bug-nmu-fixed diff --git a/templates/jennifer.new b/templates/process-unchecked.new similarity index 94% rename from templates/jennifer.new rename to templates/process-unchecked.new index 41ccd7bf..c7e33dd9 100644 --- a/templates/jennifer.new +++ b/templates/process-unchecked.new @@ -1,4 +1,4 @@ -From: __KATIE_ADDRESS__ +From: __DAK_ADDRESS__ To: __MAINTAINER_TO__ __BCC__ Precedence: bulk diff --git a/templates/jennifer.override-disparity b/templates/process-unchecked.override-disparity similarity index 97% rename from templates/jennifer.override-disparity rename to templates/process-unchecked.override-disparity index 2b78b61f..2767bd70 100644 --- a/templates/jennifer.override-disparity +++ b/templates/process-unchecked.override-disparity @@ -1,4 +1,4 @@ -From: __KATIE_ADDRESS__ +From: __DAK_ADDRESS__ To: __MAINTAINER_TO__ __BCC__ Precedence: junk diff --git a/templates/katie.rejected b/templates/queue.rejected similarity index 100% rename from templates/katie.rejected rename to templates/queue.rejected diff --git a/templates/lauren.stable-rejected b/templates/reject-proposed-updates.rejected similarity index 95% rename from templates/lauren.stable-rejected rename to templates/reject-proposed-updates.rejected index 586439eb..38bfd501 100644 --- a/templates/lauren.stable-rejected +++ b/templates/reject-proposed-updates.rejected @@ -1,4 +1,4 @@ -From: __KATIE_ADDRESS__ +From: __DAK_ADDRESS__ To: __MAINTAINER_TO__ __CC__ __BCC__ diff --git a/templates/melanie.bug-close b/templates/rm.bug-close similarity index 98% rename from templates/melanie.bug-close rename to templates/rm.bug-close index 45862b58..108a5606 100644 --- a/templates/melanie.bug-close +++ b/templates/rm.bug-close @@ -1,4 +1,4 @@ -From: __MELANIE_ADDRESS__ +From: __RM_ADDRESS__ To: __BUG_NUMBER__-close@__BUG_SERVER__ __CC__ __BCC__ diff --git a/templates/amber.advisory b/templates/security-install.advisory similarity index 96% rename from templates/amber.advisory rename to templates/security-install.advisory index 50d59e94..ff2e549c 100644 --- a/templates/amber.advisory +++ b/templates/security-install.advisory @@ -1,5 +1,5 @@ -From: __KATIE_ADDRESS__ -To: __WHOAMI__ +From: __DAK_ADDRESS__ +To: __WHOAMI__ __BCC__ Subject: Template Advisory __ADVISORY__ -- 2.39.5