From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 26 Mar 2011 14:07:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9b218664cdb36874fb393a00e4a37f50aed3d7e3;hp=2711accf0093a019afe9214cbb3e2b502076c444;p=dak.git

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
  Fix very bad logic error
  Fix Release file hardlink handling
  Fix typo
  Fix database permissions
  Avoid using an SQL keyword as a column name
  Apply update 56
  Update pickle file for DB tests.
  Add PackagesFileWriter and SourcesFileWriter.
  Implement SourceContentsFileWriter.
  various bugfixes
  Allow per-suite signing keys
  Add the *FileWriter helper classes.
---

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index d97c52ba..020a9963 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -111,7 +111,7 @@ Import-Users-From-Passwd
   // The Primary GID of your users. Using uma it is the gid from group users.
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie,dak,www-data,qa,guest";
+  KnownPostgres "postgres,katie,dak,www-data,qa,guest,repuser";
 };
 
 Queue-Report
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index cdfe9ea6..fc4017d7 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -46,7 +46,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,www-data,udmsearch";
+  KnownPostgres "postgres,dak,www-data,udmsearch,repuser";
 };
 
 Queue-Report
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b888a606..6dddf229 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -69,7 +69,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues