Allow timestamps in binary packages starting from 1975

Reference: <http://bugs.debian.org/710086#15>
上级 a30c5f2a
...@@ -12,8 +12,6 @@ Dinstall ...@@ -12,8 +12,6 @@ Dinstall
PackagesServer "packages.debian.org"; PackagesServer "packages.debian.org";
Bcc "archive@ftp-master.debian.org"; Bcc "archive@ftp-master.debian.org";
// GroupOverrideFilename "override.group-maint"; // GroupOverrideFilename "override.group-maint";
FutureTimeTravelGrace 28800; // 8 hours
PastCutoffYear "1984";
SkipTime 300; SkipTime 300;
CloseBugs "false"; CloseBugs "false";
OverrideDisparityCheck "false"; OverrideDisparityCheck "false";
......
...@@ -12,8 +12,6 @@ Dinstall ...@@ -12,8 +12,6 @@ Dinstall
PackagesServer "packages.debian.org"; PackagesServer "packages.debian.org";
TrackingServer "packages.qa.debian.org"; TrackingServer "packages.qa.debian.org";
Bcc "archive@ftp-master.debian.org"; Bcc "archive@ftp-master.debian.org";
FutureTimeTravelGrace 28800; // 8 hours
PastCutoffYear "1984";
SkipTime 300; SkipTime 300;
BXANotify "true"; BXANotify "true";
CloseBugs "true"; CloseBugs "true";
......
...@@ -328,7 +328,7 @@ class BinaryTimestampCheck(Check): ...@@ -328,7 +328,7 @@ class BinaryTimestampCheck(Check):
def check(self, upload): def check(self, upload):
cnf = Config() cnf = Config()
future_cutoff = time.time() + cnf.find_i('Dinstall::FutureTimeTravelGrace', 24*3600) 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): class TarTime(object):
def __init__(self): def __init__(self):
......
...@@ -108,14 +108,15 @@ Dinstall ...@@ -108,14 +108,15 @@ Dinstall
//// option is set. //// option is set.
// BXANotify "true"; // 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. //// future timestamps are allowed to be inside a deb before being rejected.
//// 28800 = 8 hours //// Defaults to 86400 (24 hours) if not specified.
FutureTimeTravelGrace 28800; 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. //// 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 //// SkipTime (required): an integer value which is the number of seconds
//// that a file must be older than (via it's last modified timestamp) //// that a file must be older than (via it's last modified timestamp)
......
...@@ -28,8 +28,6 @@ Dinstall ...@@ -28,8 +28,6 @@ Dinstall
MyAdminAddress "dak@__DAKFQDN__"; MyAdminAddress "dak@__DAKFQDN__";
MyDistribution "TestDakInstance"; MyDistribution "TestDakInstance";
FutureTimeTravelGrace 28800; // 8 hours
PastCutoffYear "1984";
SkipTime 10; SkipTime 10;
DefaultSuite "unstable"; DefaultSuite "unstable";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册