Stop generating dm-uploaders.html.

dm-uploaders.html is huge (74 MB) which makes is unusable. DM upload
permissions can now be seen in dm.txt.

diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions
index 06988bd57895c8a47a9499e3dcfa75cb84685e26..cf84cae84a007a59f7d29fe470e00cb270968e5e 100644 (file)
--- a/config/backports/dinstall.functions
+++ b/config/backports/dinstall.functions
@@ -434,7 +434,7 @@ function transitionsclean() {
 
 function dm() {
     log "Updating DM html page"
 
 function dm() {
     log "Updating DM html page"

-    $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
+    #$scriptsdir/dm-monitor >$webdir/dm-uploaders.html

 }
 
 function bts() {
 }
 
 function bts() {

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 8e8735bf85ec42286b79cf5df51d71b56cee4310..4836f53816d10f9049f07e8b47691e9d27a57c2f 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -401,8 +401,7 @@ function transitionsclean() {
 }
 
 function dm() {
 }
 
 function dm() {

-    log "Updating DM html page"
-    $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
+    log "Updating DM permissions page"

     dak acl export-per-source dm >$exportdir/dm.txt
 }
 
     dak acl export-per-source dm >$exportdir/dm.txt
 }
 

diff --git a/scripts/debian/dm-monitor b/scripts/debian/dm-monitor
deleted file mode 100755 (executable)
index 92a945d..0000000
--- a/scripts/debian/dm-monitor
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-echo "Known debian maintainers:"
-
-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 '%@%'
-ORDER BY uid.uid;
-EOF
-
-echo "Debian maintainers not able to update any packages:"
-
-psql --html <<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 <<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' 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 <<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 '%@%'
-ORDER BY u.uid, s.source, s.version;
-EOF
-
-echo "Binary packages in the pool uploaded by debian maintainers:"
-
-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) 
-         JOIN uid u ON (f.uid = u.id)
-   WHERE u.uid LIKE '%@%'
-ORDER BY u.uid, b.package, b.version;
-EOF
-
-echo "Recorded Uploaders:"
-
-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)
-ORDER BY m.name, s.source, s.version;
-EOF
-
-echo "Keys without a recorded uid:"
-
-psql --html <<EOF
-  SELECT *
-    FROM fingerprint f
-   WHERE f.uid IS NULL;
-EOF
-