validtime

actually make this configurable and set it to 7 days for those suites
that regularly change. dont touch any older than stable-proposed-updates.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index 4877270faa597850450783351f8fbf163d94e523..288c7708021ae37e1078f4e2ebb588d99794b526 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-09-23  Joerg Jaspert  <joerg@debian.org>
 
+       * config/debian/dak.conf: Add the validtime fields, set to 7
+       days.
+
        * dak/generate_releases.py (main): Add a "Valid-Until" line into
        our release files, meaning "$receiver shouldn't trust this files
        after that date". Should be used by apt and similar tools to

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7b7f5e8ebe039ac4a21d62d112eb56989250db9d..4377530c55f0ca324cf93ae34ff330b2db423796 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -400,6 +400,7 @@ Suite
        CodeName "etch-proposed-updates";
        OverrideCodeName "etch";
        OverrideSuite "stable";
+       ValidTime 604800; // 7 days
        Priority "4";
        VersionChecks
        {
@@ -454,6 +455,7 @@ Suite
        Description "Debian Testing distribution - Not Released";
        CodeName "lenny";
        OverrideCodeName "lenny";
+       ValidTime 604800; // 7 days
        Priority "5";
        UdebComponents
        {
@@ -493,6 +495,7 @@ Suite
        CodeName "testing-proposed-updates";
        OverrideCodeName "lenny";
        OverrideSuite "testing";
+       ValidTime 604800; // 7 days
        Priority "6";
        VersionChecks
        {
@@ -579,6 +582,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
+       ValidTime 604800; // 7 days
        Priority "7";
        VersionChecks
        {
@@ -631,6 +635,7 @@ Suite
        NotAutomatic "yes";
        OverrideCodeName "sid";
        OverrideSuite "unstable";
+       ValidTime 604800; // 7 days
        Priority "0";
        VersionChecks
        {

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 543532fdfdf0057f97bfeac809b59789d8ee4372..00831192d3da8e5ce9c6390a111fcebb6bb928d7 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -218,7 +218,11 @@ def main ():
         if codename != "":
             out.write("Codename: %s\n" % (codename))
         out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
-        out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+7*24*60*60))))
+
+        if SuiteBlock.has_key("ValidTime"):
+            validtime=float(SuiteBlock["ValidTime"])
+            out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime))))
+
         if notautomatic != "":
             out.write("NotAutomatic: %s\n" % (notautomatic))
         out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures")))))