Index: trunk/server/fedora/config/etc/scripts/prune-mailq
===================================================================
--- trunk/server/fedora/config/etc/scripts/prune-mailq	(revision 2669)
+++ trunk/server/fedora/config/etc/scripts/prune-mailq	(revision 2670)
@@ -19,4 +19,12 @@
 clean_locker() {
     echo "${1%%@scripts.mit.edu}"
+}
+
+canonicalize_address() {
+    if [[ "$1" == *@* ]]; then
+	echo "$1"
+    else
+	echo "$1@scripts.mit.edu"
+    fi
 }
 
@@ -88,7 +96,7 @@
     fi
     for locker in "$@"; do
-        locker=$(clean_locker "$locker")
-        echo "$locker..."
-        mailq | tail -n +2 | grep -v '^ *(' | awk "BEGIN { RS = \"\" } (\$7 == \"$locker@scripts.mit.edu\") { print \$1 }" | tr -d '*!' | postsuper -d -
+        address=$(canonicalize_address "$locker")
+        echo "$address..."
+        mailq | tail -n +2 | grep -v '^ *(' | awk "BEGIN { RS = \"\" } (\$7 == \"$address\") { print \$1 }" | tr -d '*!' | postsuper -d -
         echo
     done
@@ -101,7 +109,7 @@
     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 -
+        address=$(canonicalize_address "$locker")
+        echo "$address..."
+        mailq | tail -n +2 | grep -v '^ *(' | awk "BEGIN { RS = \"\" } (\$8 == \"$address\" && \$9 == \"\") { print \$1 }" | tr -d '*!' | postsuper -d -
         echo
     done