sync

diff --git a/TODO b/TODO
index 4b14f91e93b3aa3a583c83a785005a60717eed15..4cb5a7f2ec4e564c422fe6938aa5ac1f072e69bc 100644 (file)
--- a/TODO
+++ b/TODO
@@ -128,7 +128,6 @@ Less Urgent
 
   o auto-purge out-of-date stuff from non-free/contrib so that testing and stuff works
   o doogie's binary -> source index
-  o Add urgency + installed date to the DB for aj/testing (? still needed ?)
   o jt's web stuff, matt's changelog stuff (overlap)
 
   o [Hard] Need to merge non-non-US and non-US DBs.
@@ -169,7 +168,7 @@ Less Urgent
     o Revisit linking of binary->source in install() in katie.
     o Fix component handling in overrides (aj)
     o Fix lack of entires in source overrides (aj)
-    o direport misreports things as section 'devel'
+    o direport misreports things as section 'devel' (? we don't use direport)
     o vrfy check of every Maintainer+Changed-By address; valid for 3 months.
     o binary-all should be done on a per-source, per-architecture package
       basis to avoid, e.g. the perl-modules problem.
@@ -183,7 +182,7 @@ Less Urgent
     o katie/jenna/rhona/whatever needs to clear out .changes
       files from p-u when removing stuff superseded by newer versions.
       [but for now we have halle]
-    o test sig checking stuff in test/ (stupid thing is not modularized)
+    o test sig checking stuff in test/ (stupid thing is not modularized due to global abuse)
     o when encountering suspicous things (e.g. file tainting) do something more drastic
 
  * Easy:
@@ -196,7 +195,7 @@ Less Urgent
     o melanie should behave better with -a and without -b; see
       gcc-defaults removal for an example.
     o Reject on misconfigured kernel-package uploads
-    o denise abuses sys.stdout == badly  
+    o denise evily abuses sys.stdout by reassigning it
     o utils.extract_component_from_section: main/utils -> main/utils, main rather than utils, main
     o Fix jennier to warn if run when not in incoming or p-u
     o katie should validate multi-suite uploads; only possible valid one

diff --git a/add_constraints.sql b/add_constraints.sql
index f459835ff96b5ef3b9a65abcf2512c6f780f5103..71453e02a3253d76dfafcea67c36b94cd27bcd53 100644 (file)
--- a/add_constraints.sql
+++ b/add_constraints.sql
@@ -103,7 +103,7 @@ GRANT ALL ON architecture, architecture_id_seq, archive,
   maintainer_id_seq, override, override_type, override_type_id_seq,
   priority, priority_id_seq, section, section_id_seq, source,
   source_id_seq, src_associations, src_associations_id_seq, suite,
-  suite_architectures, suite_id_seq, unstable_accepted TO GROUP ftpmaster;
+  suite_architectures, suite_id_seq, accepted_autobuild TO GROUP ftpmaster;
 
 -- Read only access to user 'nobody'
 GRANT SELECT ON architecture, architecture_id_seq, archive,
@@ -114,4 +114,4 @@ GRANT SELECT ON architecture, architecture_id_seq, archive,
   maintainer_id_seq, override, override_type, override_type_id_seq,
   priority, priority_id_seq, section, section_id_seq, source,
   source_id_seq, src_associations, src_associations_id_seq, suite,
-  suite_architectures, suite_id_seq, unstable_accepted TO PUBLIC;
+  suite_architectures, suite_id_seq, accepted_autobuild TO PUBLIC;

diff --git a/katie.conf b/katie.conf
index b277385983100a9c48ad41f4effe9ba7ec6fc83d..fca9ece57161b1e3f5b25d553fc17d965b1b29bc 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -20,11 +20,14 @@ Dinstall
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
-   BXANotify "true";
    SkipTime 300;
-   SpecialAcceptedAutoBuild "true";
+   BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
+   AcceptedAutoBuildSuites
+   {
+     unstable;
+   };
 };
 
 Julia

diff --git a/katie.conf-non-US b/katie.conf-non-US
index a84e713a9a5a273b17afa9844d8f47b4a7edc02a..2d16907f6bd9607f62b83831245792327e4693f2 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -21,8 +21,6 @@ Dinstall
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
    SkipTime 300;
-   BXANotify "false";
-   SpecialAcceptedAutoBuild "false";
    CloseBugs "true";
    OverrideDisparityCheck "true";
 };

diff --git a/katie.conf-security b/katie.conf-security
index b6ecef649a2819aa8d1540af025651a67b103dfa..7f6444049acd836d03e57529b8ddcff52ab120e1 100644 (file)
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -21,7 +21,12 @@ Dinstall
    CloseBugs "false";
    OverrideDisparityCheck "false";
    BXANotify "false";
-   SpecialAcceptedAutoBuild "true";
+   AcceptedAutoBuildSuites
+   {
+     potato;
+     woody;
+   };
+   SecurityAcceptedAutoBuild "true";     
    DefaultSuite "Woody";
    OverrideMaintainer "katie@security.debian.org";
 };
@@ -184,6 +189,7 @@ Dir
     New "/org/security.debian.org/queue/new/";
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
+    AcceptedAutoBuild "/org/security.debian.org/buildd/";
   };
 };