main(): Explicitly queue the message to INQUEUE_DIR (see changes

described in qrunner for details).

5 files changed, 7 insertions, 7 deletions

diff --git a/scripts/mailcmd b/scripts/mailcmd
index 72f7a602c..e498aa9b1 100755
--- a/scripts/mailcmd
+++ b/scripts/mailcmd
@@ -61,7 +61,7 @@ def main():
     #
     # The `torequest' flag is a message to qrunner that an alternative route
     # should be taken for this message.
-    msg.Enqueue(mlist, torequest=1)
+    msg.Enqueue(mlist, torequest=1, _whichq=mm_cfg.INQUEUE_DIR)
 
 
 
diff --git a/scripts/mailowner b/scripts/mailowner
index 7ed7ba8f9..01d2bc642 100755
--- a/scripts/mailowner
+++ b/scripts/mailowner
@@ -69,9 +69,9 @@ def main():
     #
     # See cron/qrunner for the paths these to flagged messages take.
     if msg.get('to') == mlist.GetOwnerEmail():
-        msg.Enqueue(mlist, toowner=1)
+        msg.Enqueue(mlist, toowner=1, _whichq=mm_cfg.INQUEUE_DIR)
     else:
-        msg.Enqueue(mlist, toadmin=1)
+        msg.Enqueue(mlist, toadmin=1, _whichq=mm_cfg.INQUEUE_DIR)
 
 
 
diff --git a/scripts/owner b/scripts/owner
index 7ed7ba8f9..01d2bc642 100755
--- a/scripts/owner
+++ b/scripts/owner
@@ -69,9 +69,9 @@ def main():
     #
     # See cron/qrunner for the paths these to flagged messages take.
     if msg.get('to') == mlist.GetOwnerEmail():
-        msg.Enqueue(mlist, toowner=1)
+        msg.Enqueue(mlist, toowner=1, _whichq=mm_cfg.INQUEUE_DIR)
     else:
-        msg.Enqueue(mlist, toadmin=1)
+        msg.Enqueue(mlist, toadmin=1, _whichq=mm_cfg.INQUEUE_DIR)
 
 
 
diff --git a/scripts/post b/scripts/post
index b8da0f02e..75ac17c25 100755
--- a/scripts/post
+++ b/scripts/post
@@ -86,7 +86,7 @@ def main():
     # hit, the proc is SIGKILL'd giving us no chance to save the message.  It
     # could take a long time to acquire the lock.  This way we're fairly safe
     # against catastrophe at the expense of more disk I/O.
-    msg.Enqueue(mlist, tolist=1)
+    msg.Enqueue(mlist, tolist=1, _whichq=mm_cfg.INQUEUE_DIR)
 
 
 
diff --git a/scripts/request b/scripts/request
index 72f7a602c..e498aa9b1 100755
--- a/scripts/request
+++ b/scripts/request
@@ -61,7 +61,7 @@ def main():
     #
     # The `torequest' flag is a message to qrunner that an alternative route
     # should be taken for this message.
-    msg.Enqueue(mlist, torequest=1)
+    msg.Enqueue(mlist, torequest=1, _whichq=mm_cfg.INQUEUE_DIR)