Merge remote-tracking branch 'origin/master'

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/common b/config/debian/common
index 47cc9b47ef618cbee75ec65a78be69e2c1e582f0..886da457022bdea76307f204810a02a8ccb0e331 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -195,6 +195,7 @@ function reports() {
     # Send a report on NEW/BYHAND packages
     log "Nagging ftpteam about NEW/BYHAND packages"
     dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
+    dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" backports-team@debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org
     # and one on crufty packages
     log "Sending information about crufty packages"
     dak cruft-report -R > $webdir/cruft-report-daily.txt

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2d5c7dd6ba5dee4292f1bc9c2b384f9113480e05..9258ec6e84c65d3b82af693d0879974e35a07471 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -5,15 +5,13 @@ Dinstall
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
-   MyAdminAddress "ftpmaster@debian.org";
+   MyAdminAddress "ftpmaster@ftp-master.debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    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/config/debian/dak.conf-backports b/config/debian/dak.conf-backports
index 8a7a9f36e94b3c3c981fa6adb15e72f8f080bf83..82fb16fa1e25aff9bc2ad2ba65adcdb53f8e6706 100644 (file)
--- a/config/debian/dak.conf-backports
+++ b/config/debian/dak.conf-backports
@@ -1,5 +1,5 @@
 Dinstall {
-  MyAdminAddress "backports-team@debian.org";
+  MyAdminAddress "debian-backports@lists.debian.org";
 };
 
 Dir {

diff --git a/config/debian/lintian.tags b/config/debian/lintian.tags
index 5f12cfd9d207118ded00ba7039cc25b9f0299cb4..ebb2b2557358de9af6cb9c5583ba3f651e48e41c 100644 (file)
--- a/config/debian/lintian.tags
+++ b/config/debian/lintian.tags
@@ -19,7 +19,6 @@ lintian:
     - dir-or-file-in-var-www
     - wrong-file-owner-uid-or-gid
     - install-info-used-in-maintainer-script
-    - missing-pre-dependency-on-multiarch-support
     - bad-perm-for-file-in-etc-sudoers.d
     - source-contains-waf-binary
     - md5sum-mismatch

diff --git a/daklib/checks.py b/daklib/checks.py
index 5b4cafe35ccc93ef01159d4575136d8784b63f74..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):
@@ -336,9 +336,9 @@ class BinaryTimestampCheck(Check):
                 self.past_files = dict()
             def callback(self, member, data):
                 if member.mtime > future_cutoff:
-                    future_files[member.name] = member.mtime
+                    self.future_files[member.name] = member.mtime
                 elif member.mtime < past_cutoff:
-                    past_files[member.name] = member.mtime
+                    self.past_files[member.name] = member.mtime
 
         def format_reason(filename, direction, files):
             reason = "{0}: has {1} file(s) with a timestamp too far in the {2}:\n".format(filename, len(files), direction)

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";