Index: /trunk/server/fedora/config/etc/scripts/prune-mailq
===================================================================
--- /trunk/server/fedora/config/etc/scripts/prune-mailq	(revision 2409)
+++ /trunk/server/fedora/config/etc/scripts/prune-mailq	(revision 2410)
@@ -6,5 +6,11 @@
 usage="Usage:
     $0 list
-    $0 show-rand"
+    $0 show-rand
+    $0 email lockers...
+    $0 purge lockers..."
+
+clean_locker() {
+    echo "${1%%@scripts.mit.edu}"
+}
 
 show_rand() {
@@ -24,4 +30,5 @@
     fi
     for locker in "$@"; do
+        locker=$(clean_locker "$locker")
         echo "fs la /mit/$locker/"
         fs la "/mit/$locker"
@@ -63,4 +70,5 @@
     fi
     for locker in "$@"; do
+        locker=$(clean_locker "$locker")
         echo "$locker..."
         mailq | tail -n +2 | grep -v '^ *(' | awk "BEGIN { RS = \"\" } (\$8 == \"$locker@scripts.mit.edu\" && \$9 == \"\") { print \$1 }" | tr -d '*!' | postsuper -d -