X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fdebian%2Fdm-monitor;h=93e36472cf8e243f519b9c48dd7bd1f4481aa6a0;hb=564395db9f6a393a894fa1b2f7ff5aefcfadd2b7;hp=d461643304af2cf1eb4c12db0afb0b132f9ff886;hpb=dca650055f023509bf797c760c11e01f03d894bb;p=dak.git

diff --git a/scripts/debian/dm-monitor b/scripts/debian/dm-monitor
index d4616433..93e36472 100755
--- a/scripts/debian/dm-monitor
+++ b/scripts/debian/dm-monitor
@@ -5,19 +5,39 @@ echo "Known debian maintainers:"
 psql --html projectb <<EOF
   SELECT uid.uid, uid.name, f.fingerprint
     FROM uid LEFT OUTER JOIN fingerprint f ON (uid.id = f.uid) 
+   WHERE uid.uid LIKE '%@%'
+ORDER BY uid.uid;
+EOF
+
+echo "Debian maintainers not able to update any packages:"
+
+psql --html projectb <<EOF
+  SELECT uid.uid, uid.name
+    FROM uid 
    WHERE uid.uid LIKE 'dm:%'
+     AND uid.uid NOT IN (
+              SELECT 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 u.uid LIKE '%@%' AND sa.suite = 5
+         )
 ORDER BY uid.uid;
 EOF
 
 echo "Packages debian maintainers may update:"
 
 psql --html projectb <<EOF
-  SELECT s.source, s.version, u.uid
+  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 || ' <%>')
-   WHERE u.uid LIKE 'dm:%' AND sa.suite = 5
+         JOIN uid u ON (m.name LIKE u.name || ' <%>' OR
+                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
 
@@ -27,7 +47,7 @@ psql --html projectb <<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)
-   WHERE u.uid LIKE 'dm:%'
+   WHERE u.uid LIKE '%@%'
 ORDER BY u.uid, s.source, s.version;
 EOF
 
@@ -38,7 +58,7 @@ psql --html projectb <<EOF
     FROM binaries b JOIN architecture a ON (b.architecture = a.id)
          JOIN fingerprint f ON (b.sig_fpr = f.id) 
          JOIN uid u ON (f.uid = u.id)
-   WHERE u.uid LIKE 'dm:%'
+   WHERE u.uid LIKE '%@%'
 ORDER BY u.uid, b.package, b.version;
 EOF