From: Joerg Jaspert <joerg@debian.org>
Date: Wed, 23 Mar 2011 10:38:46 +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=8e32a7b21801472eb15b034e407ea04de053feb9;hp=6abe20997655ee9bee473d13d2cabfae538cbac8;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:
  Configure and test more mapper relationships.
---

diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions
index 27854f8b..0dfe19ec 100644
--- a/config/backports/dinstall.functions
+++ b/config/backports/dinstall.functions
@@ -322,7 +322,7 @@ function mkfilesindices() {
 
     ARCHLIST=$(tempfile)
 
-    log "Querying $PGDATABASE..."
+    log "Querying postgres..."
     echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql -At | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST
 
     includedirs () {
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index e4de479e..cac7c7c5 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -295,7 +295,7 @@ function mkfilesindices() {
 
     ARCHLIST=$(tempfile)
 
-    log "Querying $PGDATABASE..."
+    log "Querying postgres"
     echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql -At | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST
 
     includedirs () {