Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

diff --git a/config/backports/apt.conf b/config/backports/apt.conf
index b49e266278287abe361810a85994964a7c7776bc..0b17a106d3a788fc7cde11e59052d00120e0f325 100644 (file)
--- a/config/backports/apt.conf
+++ b/config/backports/apt.conf
@@ -59,7 +59,7 @@ tree "dists/squeeze-backports"
    FileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
+   Architectures "amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc source";
    BinOverride "override.squeeze-backports.$(SECTION)";
    ExtraOverride "override.squeeze-backports.extra.$(SECTION)";
    SrcOverride "override.squeeze-backports.$(SECTION).src";
@@ -69,7 +69,7 @@ tree "dists/squeeze-backports/main"
 {
    FileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
+   Architectures "amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc source";
    BinOverride "override.squeeze-backports.main.$(SECTION)";
    SrcOverride "override.squeeze-backports.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";

diff --git a/config/backports/cron.dinstall b/config/backports/cron.dinstall
index c2a5b32298345fee2dcd05c10af918fdf97a5b46..634ef1d979e287113359524248562c0567f57de7 100755 (executable)
--- a/config/backports/cron.dinstall
+++ b/config/backports/cron.dinstall
@@ -189,6 +189,14 @@ stage $GO
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
 
+GO=(
+    FUNC="punew"
+    TIME="p-u-new"
+    ARGS="proposedupdates"
+    ERR="false"
+)
+stage $GO
+
 GO=(
     FUNC="newstage"
     TIME="newstage"

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 10dacd3f39ed885407f2fa991d593b0180c70aec..8bde62390dac12fdb133bc8296a01d5b982a05d8 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -251,7 +251,7 @@ SuiteMappings
 {
  "map lenny lenny-backports";
  "map lenny-bpo lenny-backports";
- "map lenny-bpo-sloppy lenny-backports";
+ "map lenny-bpo-sloppy lenny-backports-sloppy";
  "map squeeze squeeze-backports";
  "map squeeze-bpo squeeze-backports";
 };

diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions
index d8ca5172c968af9e9e29e842db01be1c65aec7f2..27854f8b66eaf2dde60b547318dd23ce4bba6780 100644 (file)
--- a/config/backports/dinstall.functions
+++ b/config/backports/dinstall.functions
@@ -83,7 +83,7 @@ function updates() {
 # Process (oldstable)-proposed-updates "NEW" queue
 function punew_do() {
     date -u -R >> REPORT
-    dak process-policy $1 | tee -a REPORT | mail -e -s "NEW changes in $1" debian-release@lists.debian.org
+    dak process-policy $1 | tee -a REPORT | mail -e -s "NEW changes in $1" team@backports.debian.org
     echo >> REPORT
 }
 function punew() {

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 456bfcb1f3cad26c3257c3af3152885eefe370c4..fcac94d2290652dc2b977354ce3e796fcb8e820e 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -15,10 +15,10 @@ Default
    FileMode 0664;
 }
 
-tree "dists/stable/updates"
+tree "dists/oldstable/updates"
 {
-   FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
+   FileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.lenny.$(SECTION)";
@@ -29,12 +29,13 @@ tree "dists/stable/updates"
    Sources::Compress "gzip bzip2";
 };
 
-tree "dists/testing/updates"
+
+tree "dists/stable/updates"
 {
-   FileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+   FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source";
+   Architectures "amd64 armel i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.squeeze.$(SECTION)";
    ExtraOverride "override.squeeze.extra.$(SECTION)";
    SrcOverride "override.squeeze.$(SECTION).src";
@@ -42,3 +43,17 @@ tree "dists/testing/updates"
    Packages::Compress "gzip bzip2";
    Sources::Compress "gzip bzip2";
 };
+
+tree "dists/testing/updates"
+{
+   FileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "amd64 armel i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.wheezy.$(SECTION)";
+   ExtraOverride "override.wheezy.extra.$(SECTION)";
+   SrcOverride "override.wheezy.$(SECTION).src";
+   Contents " ";
+   Packages::Compress "gzip bzip2";
+   Sources::Compress "gzip bzip2";
+};

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index b16d0c97c137712646ef04ee90fd3c2b695a8763..336112fd3c823d8ae0d36100c8cad07fd68a27a2 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -40,3 +40,16 @@ bindirectory "squeeze"
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
+
+bindirectory "wheezy"
+{
+   Packages "wheezy/Packages";
+   Sources "wheezy/Sources";
+   Contents " ";
+
+   BinOverride "override.wheezy.all3";
+   SrcOverride "override.wheezy.all3.src";
+   BinCacheDB "packages-accepted-squeeze.db";
+   PathPrefix "";
+   Packages::Extensions ".deb .udeb";
+};

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 0ea2b4fe836b3dcae0e607353f3911282488a323..043d5481d1155401fa8bb1828cba27ffe8eb2c29 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -69,6 +69,21 @@ if [ ! -z "$dists" ]; then
     done
     trap 'kill -TERM $SSH_PID' 0
     for d in $dists; do
-        ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
+        case $d in
+            oldstable)
+                send=lenny
+                ;;
+            stable)
+                send=squeeze
+                ;;
+            testing)
+                send=testing
+                ;;
+            *)
+                send=unknown
+                ;;
+        esac
+
+        ssh wbadm@buildd -S $SSH_SOCKET trigger.security $send
     done
 fi

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index da5669759f55941b15a34993fb46ae6afcd9d717..213b0a903ee3043ebe978ca0dbad77e9b025c3e7 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -20,9 +20,9 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-               oldstable) override_suite=etch;;
-               stable) override_suite=lenny;;
-               testing) override_suite=squeeze;;
+               oldstable) override_suite=lenny;;
+               stable) override_suite=squeeze;;
+               testing) override_suite=wheezy;;
                *) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -44,7 +44,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in etch lenny squeeze; do
+for dist in lenny squeeze wheezy; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index dfd12bf96234d74c11d4c6fb3b23ac25ca5b9365..32dc6aad5a8c3b5990501aaf24fd26012d4e8941 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -8,7 +8,7 @@ Dinstall
    SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "55BE302B";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
-   MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
@@ -150,7 +150,7 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  Stable
+  OldStable
   {
        Components 
        {
@@ -169,7 +169,7 @@ Suite
        CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
 
-  Testing
+  Stable
   {
        Components
        {
@@ -181,12 +181,31 @@ Suite
        Version "";
        Origin "Debian";
        Label "Debian-Security";
-       Description "Debian testing Security Updates";
+       Description "Debian 6.0 Security Updates";
        ValidTime 864000; // 10 days
        CodeName "squeeze";
        OverrideCodeName "squeeze";
        CopyDotDak "/srv/security-master.debian.org/queue/done/";
   };
+
+  Testing
+  {
+       Components
+       {
+         updates/main;
+         updates/contrib;
+         updates/non-free;
+       };
+       Announce "dak@security.debian.org";
+       Version "";
+       Origin "Debian";
+       Label "Debian-Security";
+       Description "Debian testing Security Updates";
+       ValidTime 864000; // 10 days
+       CodeName "wheezy";
+       OverrideCodeName "wheezy";
+       CopyDotDak "/srv/security-master.debian.org/queue/done/";
+  };
 };
 
 SuiteMappings
@@ -198,6 +217,9 @@ SuiteMappings
   "silent-map etch-secure oldstable";
   "silent-map lenny-secure stable";
   "silent-map testing-security testing";
+  "silent-map lenny-security oldstable";
+  "silent-map squeeze-security stable";
+  "silent-map wheezy-security testing";
 };
 
 Dir
@@ -227,8 +249,8 @@ Dir
     Unchecked "/srv/security-master.debian.org/queue/unchecked/";
     Newstage "/srv/security-master.debian.org/queue/newstage/";
 
-    ProposedUpdates "/does/not/exist/"; // XXX fixme
-    OldProposedUpdates "/does/not/exist/"; // XXX fixme
+    ProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/srv/security-master.debian.org/does/not/exist/"; // XXX fixme
 
     Embargoed "/srv/security-master.debian.org/queue/embargoed/";
     Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index cf07086a2a93949dd66dc67e552d19701cfd5864..6faf2e13ff7576783f0c6287bc0aac683ab40ab2 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -20,63 +20,63 @@ TreeDefault
    Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top";
 };
 
-//tree "dists/oldstable-proposed-updates"
-//{
-//   FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-//   SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
-//   Sections "main contrib non-free";
-//   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-//   BinOverride "override.etch.$(SECTION)";
-//   ExtraOverride "override.etch.extra.$(SECTION)";
-//   SrcOverride "override.etch.$(SECTION).src";
-//   Contents " ";
-//};
+tree "dists/oldstable-proposed-updates"
+{
+  FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+  SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
+  Sections "main contrib non-free";
+  Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+  BinOverride "override.lenny.$(SECTION)";
+  ExtraOverride "override.lenny.extra.$(SECTION)";
+  SrcOverride "override.lenny.$(SECTION).src";
+  Contents " ";
+};
 
 tree "dists/proposed-updates"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   BinOverride "override.squeeze.$(SECTION)";
+   ExtraOverride "override.squeeze.extra.$(SECTION)";
+   SrcOverride "override.squeeze.$(SECTION).src";
    Contents " ";
 };
 
-tree "dists/testing"
+tree "dists/squeeze-updates"
 {
-   FakeDI "dists/unstable";
-   FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
    BinOverride "override.squeeze.$(SECTION)";
    ExtraOverride "override.squeeze.extra.$(SECTION)";
    SrcOverride "override.squeeze.$(SECTION).src";
+   Contents " ";
 };
 
-tree "dists/testing-proposed-updates"
+tree "dists/testing"
 {
-   FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
+   FakeDI "dists/unstable";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
-   BinOverride "override.squeeze.$(SECTION)";
-   ExtraOverride "override.squeeze.extra.$(SECTION)";
-   SrcOverride "override.squeeze.$(SECTION).src";
-   Contents " ";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   BinOverride "override.wheezy.$(SECTION)";
+   ExtraOverride "override.wheezy.extra.$(SECTION)";
+   SrcOverride "override.wheezy.$(SECTION).src";
 };
 
-tree "dists/squeeze-updates"
+tree "dists/testing-proposed-updates"
 {
-   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
-   BinOverride "override.squeeze.$(SECTION)";
-   ExtraOverride "override.squeeze.extra.$(SECTION)";
-   SrcOverride "override.squeeze.$(SECTION).src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   BinOverride "override.wheezy.$(SECTION)";
+   ExtraOverride "override.wheezy.extra.$(SECTION)";
+   SrcOverride "override.wheezy.$(SECTION).src";
    Contents " ";
 };
 
@@ -93,25 +93,25 @@ tree "dists/unstable"
 
 // debian-installer
 
-//tree "dists/oldstable-proposed-updates/main"
-//{
-//   FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
-//   Sections "debian-installer";
-//   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
-//   BinOverride "override.etch.main.$(SECTION)";
-//   SrcOverride "override.etch.main.src";
-//   BinCacheDB "packages-debian-installer-$(ARCH).db";
-//   Packages::Extensions ".udeb";
-//   Contents " ";
-//};
+tree "dists/oldstable-proposed-updates/main"
+{
+  FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+  Sections "debian-installer";
+  Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
+  BinOverride "override.lenny.main.$(SECTION)";
+  SrcOverride "override.lenny.main.src";
+  BinCacheDB "packages-debian-installer-$(ARCH).db";
+  Packages::Extensions ".udeb";
+  Contents " ";
+};
 
 tree "dists/proposed-updates/main"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+   BinOverride "override.squeeze.main.$(SECTION)";
+   SrcOverride "override.squeeze.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents " ";
@@ -121,9 +121,9 @@ tree "dists/testing/main"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
-   BinOverride "override.squeeze.main.$(SECTION)";
-   SrcOverride "override.squeeze.main.src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+   BinOverride "override.wheezy.main.$(SECTION)";
+   SrcOverride "override.wheezy.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb";
@@ -133,9 +133,9 @@ tree "dists/testing/non-free"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
-   BinOverride "override.squeeze.main.$(SECTION)";
-   SrcOverride "override.squeeze.main.src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+   BinOverride "override.wheezy.main.$(SECTION)";
+   SrcOverride "override.wheezy.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb-nf";
@@ -145,9 +145,9 @@ tree "dists/testing-proposed-updates/main"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
-   BinOverride "override.squeeze.main.$(SECTION)";
-   SrcOverride "override.squeeze.main.src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+   BinOverride "override.wheezy.main.$(SECTION)";
+   SrcOverride "override.wheezy.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents " ";

diff --git a/config/debian/apt.conf.oldstable b/config/debian/apt.conf.oldstable
index 1cfe2357101819d54b9d35e3b957f27d3a33bc6f..0bc8839b360e740371419f65132e19e3e6ce3418 100644 (file)
--- a/config/debian/apt.conf.oldstable
+++ b/config/debian/apt.conf.oldstable
@@ -24,10 +24,10 @@ tree "dists/oldstable"
    FileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.etch.$(SECTION)";
-   ExtraOverride "override.etch.extra.$(SECTION)";
-   SrcOverride "override.etch.$(SECTION).src";
+   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.lenny.$(SECTION)";
+   ExtraOverride "override.lenny.extra.$(SECTION)";
+   SrcOverride "override.lenny.$(SECTION).src";
 };
 
 // debian-installer
@@ -36,9 +36,9 @@ tree "dists/oldstable/main"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
-   BinOverride "override.etch.main.$(SECTION)";
-   SrcOverride "override.etch.main.src";
+   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.lenny.main.$(SECTION)";
+   SrcOverride "override.lenny.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb";
@@ -48,9 +48,9 @@ tree "dists/oldstable/non-free"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
-   BinOverride "override.etch.main.$(SECTION)";
-   SrcOverride "override.etch.main.src";
+   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.lenny.main.$(SECTION)";
+   SrcOverride "override.lenny.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb-nf";

diff --git a/config/debian/apt.conf.stable b/config/debian/apt.conf.stable
index 0e854c120bc40afbdf627be9fbbc1533ac16a642..0b61d23562b6cd34c2e627ea2f338fa8b2c28c36 100644 (file)
--- a/config/debian/apt.conf.stable
+++ b/config/debian/apt.conf.stable
@@ -24,10 +24,10 @@ tree "dists/stable"
    FileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   BinOverride "override.squeeze.$(SECTION)";
+   ExtraOverride "override.squeeze.extra.$(SECTION)";
+   SrcOverride "override.squeeze.$(SECTION).src";
 };
 
 // debian-installer
@@ -36,9 +36,9 @@ tree "dists/stable/main"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   BinOverride "override.squeeze.main.$(SECTION)";
+   SrcOverride "override.squeeze.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb";
@@ -48,9 +48,9 @@ tree "dists/stable/non-free"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/stable_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
+   Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+   BinOverride "override.squeeze.main.$(SECTION)";
+   SrcOverride "override.squeeze.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb-nf";

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index d275354cc2daf6f7505906a9d628bb2a1b5c8140..d66e2348093906cddbee525710896863d2321d36 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -214,13 +214,13 @@ GO=(
 )
 stage $GO
 
-#GO=(
-#    FUNC="opunew"
-#    TIME="o-p-u-new"
-#    ARGS="oldproposedupdates"
-#    ERR="false"
-#)
-#stage $GO
+GO=(
+    FUNC="opunew"
+    TIME="o-p-u-new"
+    ARGS="oldproposedupdates"
+    ERR="false"
+)
+stage $GO
 
 GO=(
     FUNC="newstage"

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 0a3e70c694a198600534c27ab1197b08a0b2ad23..e6567d9aaa161e137488b2154281c956a93fd08d 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -168,6 +168,16 @@ Check-Overrides
 
 Suite
 {
+  OldStable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+  };
+
   Stable
   {
        Components
@@ -178,6 +188,27 @@ Suite
        };
   };
 
+  OldStable-Proposed-Updates
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           OldStable;
+         };
+         Enhances
+          {
+           OldStable;
+         };
+       };
+  };
+
   Proposed-Updates
   {
        Components
@@ -258,11 +289,17 @@ Suite
          MustBeNewerThan
          {
            Stable;
-           Testing;
          };
+      MustBeOlderThan
+      {
+        Testing;
+        Testing-Proposed-Updates;
+        Unstable;
+        Experimental;
+      };
          Enhances
       {
-           Testing;
+           Stable;
          };
        };
 
@@ -315,19 +352,23 @@ Suite
 
 SuiteMappings
 {
-// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+ "silent-map lenny-security oldstable-security";
+ "silent-map squeeze-security stable-security";
+ "silent-map wheezy-security testing-security";
+ "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
- "map lenny stable";
- "map squeeze testing";
+ "map lenny oldstable";
+ "map squeeze stable";
+ "map wheezy testing";
  "map sid unstable";
  "map rc-buggy experimental";
-// "map oldstable oldstable-proposed-updates";
-// "map oldstable-security oldstable-proposed-updates";
+ "map oldstable oldstable-proposed-updates";
+ "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
-// "map-unreleased oldstable unstable";
+ "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
@@ -394,9 +435,9 @@ Dir
     Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
     Newstage "/srv/ftp-master.debian.org/queue/newstage/";
     BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
-    Embargoed "/does/not/exist/";
-    Unembargoed "/does/not/exist/";
-    Disembargo "/does/not/exist/";
+    Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
+    Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
+    Disembargo "/srv/ftp-master.debian.org/does/not/exist/";
   };
 };
 

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index f3ab3816cab27390a13f6fd0c35782e5c29665cf..1834841b74b1ad04505b0aca1e093f63d92af4eb 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -123,7 +123,7 @@ function i18n1() {
             # Lets check!
             if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
                 # Yay, worked, lets copy around
-                for dir in squeeze sid; do
+                for dir in wheezy sid; do
                     if [ -d dists/${dir}/ ]; then
                         cd dists/${dir}/main/i18n
                         rsync -aq --delete --delete-after  . ${ftpdir}/dists/${dir}/main/i18n/.
@@ -401,12 +401,12 @@ function mkfilesindices() {
     done
 
     (cd $base/ftp/
-           for dist in sid squeeze; do
+           for dist in sid wheezy; do
                    find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz
            done
     )
 
-    (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-squeeze.list.gz) |
+    (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-wheezy.list.gz) |
     sort -u | poolfirst > ../typical.files
 
     rm -f $ARCHLIST
@@ -491,8 +491,8 @@ function i18n2() {
     STAMP=$(date "+%Y%m%d%H%M")
     mkdir -p ${scriptdir}/i18n/${STAMP}
     cd ${scriptdir}/i18n/${STAMP}
-    dak control-suite -l stable > lenny
-    dak control-suite -l testing > squeeze
+    dak control-suite -l stable > squeeze
+    dak control-suite -l testing > wheezy
     dak control-suite -l unstable > sid
     echo "${STAMP}" > timestamp
     gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp

diff --git a/config/debian/vars b/config/debian/vars
index 224843da7c833126ee0bb10832c51dc52e49b728..19dee850447b05a30e59ae597be21db5bc72ead3 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -6,7 +6,7 @@ bindir=$base/bin
 ftpdir=$base/ftp
 webdir=$public/web
 indices=$ftpdir/indices
-archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 "
+archs=$(dak admin a list | tr '\n' ' ')
 
 scriptdir=$base/scripts
 masterdir=$base/dak/
@@ -30,7 +30,7 @@ exportpublic=$public/rsync/export/
 
 ftpgroup=debadmin
 
-copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free squeeze.contrib squeeze.contrib.src squeeze.main squeeze.main.src squeeze.non-free squeeze.non-free.src squeeze.extra.main squeeze.extra.contrib squeeze.extra.non-free"
+copyoverrides="wheezy.contrib wheezy.contrib.src wheezy.main wheezy.main.src wheezy.non-free wheezy.non-free.src wheezy.extra.main wheezy.extra.non-free wheezy.extra.contrib wheezy.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free squeeze.contrib squeeze.contrib.src squeeze.main squeeze.main.src squeeze.non-free squeeze.non-free.src squeeze.extra.main squeeze.extra.contrib squeeze.extra.non-free"
 
 TMPDIR=${base}/tmp
 

diff --git a/dak/dakdb/update41.py b/dak/dakdb/update41.py
index 338648fa2f08df10bb2b0916ee44ea2c52a8d3c2..813a3b709e17a83488245ef748a70d7e44f6ce52 100755 (executable)
--- a/dak/dakdb/update41.py
+++ b/dak/dakdb/update41.py
@@ -2,8 +2,8 @@
 # coding=utf8
 
 """
-Remove useless type casts from primary keys to support sqlalchemy's
-reflection mechanism for all tables. Rename 2 sequences.
+Remove useless type casts from primary keys to support sqlalchemy's reflection
+mechanism for all tables. Rename 2 sequences and add 1 primary key.
 
 @contact: Debian FTP Master <ftpmaster@debian.org>
 @copyright: 2011 Torsten Werner <twerner@debian.org>
@@ -33,11 +33,14 @@ from socket import gethostname;
 ################################################################################
 def do_update(self):
     """
-    Remove useless type casts from primary keys and fix 2 sequences.
+    Remove useless type casts from primary keys, fix 2 sequences, and add 1
+    primary key.
     """
     print __doc__
     try:
         c = self.db.cursor()
+
+        # remove useless type casts
         for table in ('architecture', 'archive', 'bin_associations', \
             'binaries', 'component', 'dsc_files', 'files', \
             'fingerprint', 'location', 'maintainer', 'override_type', \
@@ -46,9 +49,15 @@ def do_update(self):
             c.execute("ALTER TABLE %s ALTER id SET DEFAULT nextval('%s_id_seq'::regclass)" % \
                 (table, table))
 
+        # rename sequences
         c.execute("ALTER SEQUENCE known_changes_id_seq RENAME TO changes_id_seq")
         c.execute("ALTER SEQUENCE queue_files_id_seq RENAME TO build_queue_files_id_seq")
 
+        # replace unique contraint by primary key
+        c.execute( \
+            "ALTER TABLE bin_contents DROP CONSTRAINT bin_contents_file_key");
+        c.execute("ALTER TABLE bin_contents ADD PRIMARY KEY (file, binary_id)");
+
         c.execute("UPDATE config SET value = '41' WHERE name = 'db_revision'")
         self.db.commit()
 

diff --git a/dak/dakdb/update42.py b/dak/dakdb/update42.py
new file mode 100755 (executable)
index 0000000..48bc9d6
--- /dev/null
+++ b/dak/dakdb/update42.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add "ButAutomaticUpgrades" field to the suite table
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# 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 psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from socket import gethostname;
+
+################################################################################
+def do_update(self):
+    """
+    Add "ButAutomaticUpgrades" field to the suite table
+    """
+    print __doc__
+    try:
+        c = self.db.cursor()
+
+        c.execute("ALTER TABLE suite ADD COLUMN butautomaticupgrades BOOLEAN NOT NULL DEFAULT FALSE;")
+        c.execute("ALTER TABLE suite ADD CONSTRAINT bau_needs_na_set CHECK (not butautomaticupgrades or notautomatic);")
+
+        c.execute("UPDATE config SET value = '42' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError, msg:
+        self.db.rollback()
+        raise DBUpdateError, 'Unable to apply update 42, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index 00489083851fade54710495ccd13943839726b39..f1d07fab5779325d29b0293747d9ef4624cf1ba6 100755 (executable)
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -111,9 +111,9 @@ tree "dists/testing"
    SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "%(arch)s";
-   BinOverride "override.squeeze.$(SECTION)";
-   ExtraOverride "override.squeeze.extra.$(SECTION)";
-   SrcOverride "override.squeeze.$(SECTION).src";
+   BinOverride "override.wheezy.$(SECTION)";
+   ExtraOverride "override.wheezy.extra.$(SECTION)";
+   SrcOverride "override.wheezy.$(SECTION).src";
 };
 """
 
@@ -137,8 +137,8 @@ tree "dists/testing/main"
    FileList "/srv/ftp-master.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "%(arch)s";
-   BinOverride "override.squeeze.main.$(SECTION)";
-   SrcOverride "override.squeeze.main.src";
+   BinOverride "override.wheezy.main.$(SECTION)";
+   SrcOverride "override.wheezy.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    %(contentsline)s
@@ -149,8 +149,8 @@ tree "dists/testing/non-free"
    FileList "/srv/ftp-master.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "%(arch)s";
-   BinOverride "override.squeeze.main.$(SECTION)";
-   SrcOverride "override.squeeze.main.src";
+   BinOverride "override.wheezy.main.$(SECTION)";
+   SrcOverride "override.wheezy.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    %(contentsline)s
@@ -239,9 +239,9 @@ tree "dists/testing-proposed-updates"
    SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "%(arch)s";
-   BinOverride "override.squeeze.$(SECTION)";
-   ExtraOverride "override.squeeze.extra.$(SECTION)";
-   SrcOverride "override.squeeze.$(SECTION).src";
+   BinOverride "override.wheezy.$(SECTION)";
+   ExtraOverride "override.wheezy.extra.$(SECTION)";
+   SrcOverride "override.wheezy.$(SECTION).src";
    Contents " ";
 };
 """
@@ -251,8 +251,8 @@ tree "dists/testing-proposed-updates/main"
    FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "%(arch)s";
-   BinOverride "override.squeeze.main.$(SECTION)";
-   SrcOverride "override.squeeze.main.src";
+   BinOverride "override.wheezy.main.$(SECTION)";
+   SrcOverride "override.wheezy.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents " ";
@@ -266,9 +266,9 @@ tree "dists/proposed-updates"
    SourceFileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "%(arch)s";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
+   BinOverride "override.squeeze.$(SECTION)";
+   ExtraOverride "override.squeeze.extra.$(SECTION)";
+   SrcOverride "override.squeeze.$(SECTION).src";
    Contents " ";
 };
 """
@@ -278,8 +278,8 @@ tree "dists/proposed-updates/main"
    FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "%(arch)s";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
+   BinOverride "override.squeeze.main.$(SECTION)";
+   SrcOverride "override.squeeze.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents " ";

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 4004662035ceb9abd89fa034bceab82c864537f4..2e28fb28e39207ea21bcb6bd05dd762ea3157c80 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -150,7 +150,7 @@ def print_sha1_files (tree, files):
 def print_sha256_files (tree, files):
     print_md5sha_files (tree, files, apt_pkg.sha256sum)
 
-def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic=""):
+def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic="", butautomaticupgrades=""):
     try:
         if os.access(relpath, os.F_OK):
             if os.stat(relpath).st_nlink > 1:
@@ -172,6 +172,8 @@ def write_release_file (relpath, suite, component, origin, label, arch, version=
     release.write("Label: %s\n" % (label))
     if notautomatic != "":
         release.write("NotAutomatic: %s\n" % (notautomatic))
+    if butautomaticupgrades != "":
+        release.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades))
     release.write("Architecture: %s\n" % (arch))
     release.close()
 
@@ -237,6 +239,11 @@ def main ():
         else:
             notautomatic = ""
 
+        if suiteobj.butautomaticupgrades:
+            butautomaticupgrades = "yes"
+        else:
+            butautomaticupgrades = ""
+
         if SuiteBlock.has_key("Components"):
             components = SuiteBlock.ValueList("Components")
         else:
@@ -277,6 +284,8 @@ def main ():
 
         if notautomatic != "":
             out.write("NotAutomatic: %s\n" % (notautomatic))
+        if butautomaticupgrades != "":
+            out.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades))
         out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
         if components:
             out.write("Components: %s\n" % (" ".join(components)))
@@ -322,7 +331,7 @@ def main ():
                     else:
                         rel = "%s/binary-%s/Release" % (sec, arch)
                     relpath = Cnf["Dir::Root"]+tree+"/"+rel
-                    write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic)
+                    write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades)
                     files.append(rel)
                 gen_i18n_index(files, tree, sec)
 
@@ -337,7 +346,7 @@ def main ():
                         if arch != "source":  # always true
                             rel = "%s/%s/binary-%s/Release" % (dis, sec, arch)
                             relpath = Cnf["Dir::Root"]+tree+"/"+rel
-                            write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic)
+                            write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades)
                             files.append(rel)
                             for cfile in compressnames("tree::%s/%s" % (tree,dis),
                                 "Packages",

diff --git a/dak/update_db.py b/dak/update_db.py
index 7aa7c6d65530df97d98801b1fd7d02262c2af6b0..928396c531d702e252f2da63f59df5795d24fab4 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -45,7 +45,7 @@ from daklib.dak_exceptions import DBUpdateError
 ################################################################################
 
 Cnf = None
-required_database_schema = 41
+required_database_schema = 42
 
 ################################################################################
 

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index f0049a1a0c1addb7422bef47841cfff45218c9f9..67852949fe35083dededb021e20418292315fa57 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -53,7 +53,8 @@ from tempfile import mkstemp, mkdtemp
 from inspect import getargspec
 
 import sqlalchemy
-from sqlalchemy import create_engine, Table, MetaData, Column, Integer, desc
+from sqlalchemy import create_engine, Table, MetaData, Column, Integer, desc, \
+    Text, ForeignKey
 from sqlalchemy.orm import sessionmaker, mapper, relation, object_session, \
     backref, MapperExtension, EXT_CONTINUE, object_mapper
 from sqlalchemy import types as sqltypes
@@ -465,12 +466,9 @@ __all__.append('get_archive')
 
 ################################################################################
 
-class BinContents(object):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def __repr__(self):
-        return '<BinContents (%s, %s)>' % (self.binary, self.filename)
+class BinContents(ORMObject):
+    def properties(silf):
+        return ['file', 'binary']
 
 __all__.append('BinContents')
 
@@ -491,7 +489,7 @@ class DBBinary(ORMObject):
     def properties(self):
         return ['package', 'version', 'maintainer', 'source', 'architecture', \
             'poolfile', 'binarytype', 'fingerprint', 'install_date', \
-            'suites_count', 'binary_id']
+            'suites_count', 'binary_id', 'contents_count']
 
     def not_null_constraints(self):
         return ['package', 'version', 'maintainer', 'source',  'poolfile', \
@@ -2909,7 +2907,6 @@ class DBConn(object):
         )
 
         tables_no_primary = (
-            'bin_contents',
             'changes_pending_files_map',
             'changes_pending_source_files',
             'changes_pool_files',
@@ -2961,6 +2958,14 @@ class DBConn(object):
             table = Table(table_name, self.db_meta, autoload=True)
             setattr(self, 'tbl_%s' % table_name, table)
 
+        # bin_contents needs special attention until update #41 has been
+        # applied
+        self.tbl_bin_contents = Table('bin_contents', self.db_meta, \
+            Column('file', Text, primary_key = True),
+            Column('binary_id', Integer, ForeignKey('binaries.id'), \
+                primary_key = True),
+            autoload=True, useexisting=True)
+
         for view_name in views:
             view = Table(view_name, self.db_meta, autoload=True)
             setattr(self, 'view_%s' % view_name, view)
@@ -3233,6 +3238,12 @@ class DBConn(object):
                                  fingerprint = relation(Fingerprint, backref="uploadblocks"),
                                  uid = relation(Uid, backref="uploadblocks")))
 
+        mapper(BinContents, self.tbl_bin_contents,
+            properties = dict(
+                binary = relation(DBBinary,
+                    backref=backref('contents', lazy='dynamic')),
+                file = self.tbl_bin_contents.c.file))
+
     ## Connection functions
     def __createconn(self):
         from config import Config

diff --git a/scripts/debian/ddtp-i18n-check.sh b/scripts/debian/ddtp-i18n-check.sh
index 1d3736450cf5eca241333801c28bc2f97e7d5dc2..cefb68e62bc334507161a4bd31294f88aac63337 100755 (executable)
--- a/scripts/debian/ddtp-i18n-check.sh
+++ b/scripts/debian/ddtp-i18n-check.sh
@@ -81,7 +81,7 @@ elif [ ! -d "$PACKAGES_LISTS_DIR" ]; then
 fi
 
 #STABLE="lenny"
-TESTING="squeeze"
+TESTING="wheezy"
 UNSTABLE="sid"
 
 # Original SHA256SUMS, generated by i18n.debian.net