[dak/master] 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>
---
ChangeLog | 3 +++
config/debian/dak.conf | 5 +++++
dak/generate_releases.py | 6 +++++-
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4877270..288c770 100644
--- 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 7b7f5e8..4377530 100644
--- 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 543532f..0083119 100755
--- 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")))))
--
1.5.6.5
Reply to: