Allow timestamps in binary packages starting from 1975

Reference: <http://bugs.debian.org/710086#15>

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 1da7d3557e5d0e7f3654fbb62c99cb2504e52531..f6459d5c62a96f7011d1a70af0b0902dce8ea520 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -12,8 +12,6 @@ Dinstall
    PackagesServer "packages.debian.org";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 300;
    CloseBugs "false";
    OverrideDisparityCheck "false";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index a14cd80beb1791c76f18e314367b699fc50b9ae4..9258ec6e84c65d3b82af693d0879974e35a07471 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -12,8 +12,6 @@ Dinstall
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
    Bcc "archive@ftp-master.debian.org";
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 300;
    BXANotify "true";
    CloseBugs "true";

diff --git a/daklib/checks.py b/daklib/checks.py
index 5202f1bf15093358e02ed5fc989b02b9889a91f5..3e7a73d4fdc2b2797bef281a298c9d3c86e5b3cc 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -328,7 +328,7 @@ class BinaryTimestampCheck(Check):
     def check(self, upload):
         cnf = Config()
         future_cutoff = time.time() + cnf.find_i('Dinstall::FutureTimeTravelGrace', 24*3600)
-        past_cutoff = time.mktime(time.strptime(cnf.find('Dinstall::PastCutoffYear', '1984'), '%Y'))
+        past_cutoff = time.mktime(time.strptime(cnf.find('Dinstall::PastCutoffYear', '1975'), '%Y'))
 
         class TarTime(object):
             def __init__(self):

diff --git a/docs/README.config b/docs/README.config
index 7fabb4ee281b245a20afbf1f54cde999ab7d3b95..0e9dbd3377d0a64b1a90906528a2e6f88255dd8e 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -108,14 +108,15 @@ Dinstall
     //// option is set.
     // BXANotify "true";
 
-    //// FutureTimeTravelGrace (required): specifies how many seconds into the
+    //// FutureTimeTravelGrace (optional): specifies how many seconds into the
     //// future timestamps are allowed to be inside a deb before being rejected.
-    //// 28800 = 8 hours
-    FutureTimeTravelGrace 28800;
+    //// Defaults to 86400 (24 hours) if not specified.
+    FutureTimeTravelGrace 86400;
 
-    //// PastCutoffYear (required): specifies the cut-off year which is used when
+    //// PastCutoffYear (optional): specifies the cut-off year which is used when
     //// deciding whether or not to reject packages based on the file timestamp.
-    PastCutoffYear "1984";
+    //// Defaults to "1975" if not specified.
+    PastCutoffYear "1975";
 
     //// SkipTime (required): an integer value which is the number of seconds
     //// that a file must be older than (via it's last modified timestamp)

diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index 834c37aca2651e84ab03c471dddc40343f6fcf7d..3b6b27add119181e48cf008d11a518e530afda67 100644 (file)
--- a/setup/dak-minimal.conf.template
+++ b/setup/dak-minimal.conf.template
@@ -28,8 +28,6 @@ Dinstall
    MyAdminAddress "dak@__DAKFQDN__";
    MyDistribution "TestDakInstance";
 
-   FutureTimeTravelGrace 28800; // 8 hours
-   PastCutoffYear "1984";
    SkipTime 10;
 
    DefaultSuite "unstable";