X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fgenerate-d-i;h=49e93d2978b48a72e1394d7befc871a4b806dc02;hb=18f89c1a61cd638209e81720ba2e6dc96ecdcf68;hp=fee0ba5bbe6c21097a8e243ff293fa3d97b1dbb3;hpb=e4619ba4be25b3724b343780d9d32ce8cfbe905a;p=dak.git

diff --git a/scripts/debian/generate-d-i b/scripts/debian/generate-d-i
index fee0ba5b..49e93d29 100755
--- a/scripts/debian/generate-d-i
+++ b/scripts/debian/generate-d-i
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Original written from Jeroen van Wolffelaar <jeroen@debian.org>
 
 set -e
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 export PAGER=cat
@@ -12,27 +12,53 @@ exec > $webdir/d-i 2>&1
 
 
 echo "udeb's in testing that don't (anymore) correspond to any testing source:"
-psql projectb -c "select b.package, b.version, (SELECT arch_string from
-architecture where b.architecture=architecture.id) as arch, s.source from
-bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s
-on (b.source=s.id) WHERE ba.suite=4 AND s.id NOT IN (SELECT source from
-src_associations WHERE suite=4) AND b.type = 'udeb' ORDER BY s.source,
-b.package, b.architecture;"
+psql -c "
+  SELECT
+    b.package,
+    b.version,
+    (SELECT arch_string from architecture where b.architecture = architecture.id) as arch,
+    s.source
+  FROM bin_associations ba
+  LEFT JOIN binaries b on (ba.bin = b.id)
+  LEFT JOIN source s on (b.source = s.id)
+  WHERE ba.suite = 4
+    AND s.id NOT IN (SELECT source from src_associations WHERE suite = 4)
+    AND b.type = 'udeb'
+  ORDER BY s.source, b.package, b.architecture;
+  "
 
 echo "udeb's in unstable that should be in testing too:"
-psql projectb -c "select b.package, b.version, (SELECT arch_string from
-architecture where b.architecture=architecture.id) as arch, s.source from
-bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s
-on (b.source=s.id) WHERE ba.suite=5 AND NOT EXISTS (SELECT 1 FROM
-bin_associations ba2 WHERE ba2.suite=4 AND ba2.bin=ba.bin) AND s.id IN (SELECT
-source from src_associations WHERE suite=4) AND b.type = 'udeb' AND
-b.architecture NOT IN (4,8,12) ORDER BY s.source, b.package, b.architecture;"
+psql -c "
+  SELECT
+    b.package,
+    b.version,
+    (SELECT arch_string from architecture where b.architecture = architecture.id) as arch,
+    s.source
+  FROM bin_associations ba
+  LEFT JOIN binaries b on (ba.bin=b.id)
+  LEFT JOIN source s on (b.source=s.id)
+  WHERE ba.suite=5
+    AND NOT EXISTS (SELECT 1 FROM bin_associations ba2 WHERE ba2.suite = 4 AND ba2.bin = ba.bin)
+    AND s.id IN (SELECT source from src_associations WHERE suite=4)
+    AND b.type = 'udeb'
+    AND b.architecture NOT IN (4,8,12)
+  ORDER BY s.source, b.package, b.architecture;
+  "
 
 echo "udeb's in t-p-u that should be in testing too:"
-psql projectb -c "select b.package, b.version, (SELECT arch_string from
-architecture where b.architecture=architecture.id) as arch, s.source from
-bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s
-on (b.source=s.id) WHERE ba.suite=3 AND NOT EXISTS (SELECT 1 FROM
-bin_associations ba2 WHERE ba2.suite=4 AND ba2.bin=ba.bin) AND s.id IN (SELECT
-source from src_associations WHERE suite=4) AND b.type = 'udeb' AND
-b.architecture NOT IN (4,8,12) ORDER BY s.source, b.package, b.architecture;"
+psql -c "
+  SELECT
+    b.package,
+    b.version,
+    (SELECT arch_string from architecture where b.architecture=architecture.id) as arch,
+    s.source
+  FROM bin_associations ba
+  LEFT JOIN binaries b ON ba.bin = b.id
+  LEFT JOIN source s ON b.source = s.id
+  WHERE ba.suite = 3
+    AND NOT EXISTS (SELECT 1 FROM bin_associations ba2 WHERE ba2.suite = 4 AND ba2.bin = ba.bin)
+    AND s.id IN (SELECT source from src_associations WHERE suite = 4)
+    AND b.type = 'udeb'
+    AND b.architecture NOT IN (4,8,12)
+  ORDER BY s.source, b.package, b.architecture;
+  "