From: Mark Hymers <mhy@debian.org>
Date: Sat, 30 Jul 2011 08:20:29 +0000 (+0100)
Subject: Merge remote branch 'mhy/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ebbb5c16d0a0ea9350bf1c139c8265dc2f470b6a;hp=67b84a241c5f2a75b5ae2362257da3a1b285ae2c;p=dak.git

Merge remote branch 'mhy/master'
---

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 2ade7c46..09559953 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -17,7 +17,6 @@ Dinstall
    // actions related to the package. For an example look at
    // packages.qa.debian.org
    // TrackingServer "packages.qa.test.backports.org";
-   LockFile "/srv/backports-master.debian.org/lock/dinstall.lock";
    // If defined this address gets a bcc of all mails.
    // FIXME: Einrichten wenn das hier produktiv geht!
    Bcc "debian-backports-changes@lists.debian.org";
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index d0d4fb94..aa729c37 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -11,7 +11,6 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security-master.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index cb8b1f9a..503659ac 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -11,7 +11,6 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index 42c6881d..57f49489 100644
--- a/setup/dak-minimal.conf.template
+++ b/setup/dak-minimal.conf.template
@@ -28,8 +28,6 @@ Dinstall
    MyAdminAddress "dak@__DAKFQDN__";
    MyDistribution "TestDakInstance";
 
-   LockFile "__DAKBASE__/lock/dinstall.lock";
-
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 10;
diff --git a/templates/missing-contents b/templates/missing-contents
deleted file mode 100644
index 8605e022..00000000
--- a/templates/missing-contents
+++ /dev/null
@@ -1,15 +0,0 @@
-From: __DAK_ADDRESS__
-To: __TO_ADDRESS__
-X-Debian: DAK
-X-Debian-Package: __PACKAGE__
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Subject: Missing contents for __PACKAGE__ in accepted queue
-
-While processing the accepted queue, I didn't have contents in the
-database for __PACKAGE__ version __VERSION__ for arch __ARCH__.  These
-contents should have been put into the database by process-unchecked
-when the package first arrived.
-
-This is probably stew's fault.