X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=scripts%2Fdebian%2Fdm-monitor;h=92a945d52646dcf850fbbae087f6f0865979d9d0;hp=bf8e34b12275fd10c0bc442ebbe0134493b2d6ae;hb=df131e0dc693a13027e4d95a0c48cc453e8bfacc;hpb=4648cd873f22916947f536bf077ed73b6305af8e

diff --git a/scripts/debian/dm-monitor b/scripts/debian/dm-monitor
index bf8e34b1..92a945d5 100755
--- a/scripts/debian/dm-monitor
+++ b/scripts/debian/dm-monitor
@@ -2,7 +2,9 @@
 
 echo "Known debian maintainers:"
 
-psql --html projectb <<EOF
+eval $(dak admin config db-shell)
+
+psql --html <<EOF
   SELECT uid.uid, uid.name, f.fingerprint
     FROM uid LEFT OUTER JOIN fingerprint f ON (uid.id = f.uid) 
    WHERE uid.uid LIKE '%@%'
@@ -11,7 +13,7 @@ EOF
 
 echo "Debian maintainers not able to update any packages:"
 
-psql --html projectb <<EOF
+psql --html <<EOF
   SELECT uid.uid, uid.name
     FROM uid 
    WHERE uid.uid LIKE 'dm:%'
@@ -30,20 +32,20 @@ EOF
 
 echo "Packages debian maintainers may update:"
 
-psql --html projectb <<EOF
-  SELECT s.source, s.version, u.uid
+psql --html <<EOF
+  SELECT s.source, space_separated_list(s.version), u.uid
     FROM src_uploaders su JOIN source s ON (su.source = s.id) 
          JOIN src_associations sa ON (s.id = sa.source)
          JOIN maintainer m ON (su.maintainer = m.id)
          JOIN uid u ON (m.name LIKE u.name || ' <%>' OR
-		        m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
-   WHERE s.dm_upload_allowed = 't'
+                m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
+   WHERE s.dm_upload_allowed = 't' GROUP BY s.source, s.version, u.uid
 ORDER BY u.uid, s.source, s.version;
 EOF
 
 echo "Source packages in the pool uploaded by debian maintainers:"
 
-psql --html projectb <<EOF
+psql --html <<EOF
   SELECT s.source, s.version, s.install_date, u.uid
     FROM source s JOIN fingerprint f ON (s.sig_fpr = f.id) 
          JOIN uid u ON (f.uid = u.id)
@@ -53,7 +55,7 @@ EOF
 
 echo "Binary packages in the pool uploaded by debian maintainers:"
 
-psql --html projectb <<EOF
+psql --html <<EOF
   SELECT b.package, b.version, a.arch_string AS arch, u.uid
     FROM binaries b JOIN architecture a ON (b.architecture = a.id)
          JOIN fingerprint f ON (b.sig_fpr = f.id) 
@@ -64,7 +66,7 @@ EOF
 
 echo "Recorded Uploaders:"
 
-psql --html projectb <<EOF
+psql --html <<EOF
   SELECT s.source, s.version, m.name
     FROM src_uploaders su JOIN source s ON (su.source = s.id) 
          JOIN maintainer m ON (su.maintainer = m.id)
@@ -73,7 +75,7 @@ EOF
 
 echo "Keys without a recorded uid:"
 
-psql --html projectb <<EOF
+psql --html <<EOF
   SELECT *
     FROM fingerprint f
    WHERE f.uid IS NULL;