33 files changed, 199 insertions, 67 deletions

diff --git a/bin/add_members b/bin/add_members
index 2a2b89db5..e9e008f6b 100755
--- a/bin/add_members
+++ b/bin/add_members
@@ -90,9 +90,13 @@ _ = i18n._
 
 
 def usage(status, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if status:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(status)
 
 
diff --git a/bin/arch b/bin/arch
index 4ceec8684..c5934d6b4 100644
--- a/bin/arch
+++ b/bin/arch
@@ -69,9 +69,13 @@ i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE)
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/change_pw b/bin/change_pw
index b2f0fed30..0e365e087 100644
--- a/bin/change_pw
+++ b/bin/change_pw
@@ -83,9 +83,13 @@ SPACE = ' '
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/check_db b/bin/check_db
index a9261c39b..c869b1949 100755
--- a/bin/check_db
+++ b/bin/check_db
@@ -66,9 +66,13 @@ PROGRAM = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/check_perms b/bin/check_perms
index 4f20cbe3e..c3f2ef926 100755
--- a/bin/check_perms
+++ b/bin/check_perms
@@ -295,9 +295,13 @@ def checkdata():
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/cleanarch b/bin/cleanarch
index 69a9a774a..85a8df6aa 100644
--- a/bin/cleanarch
+++ b/bin/cleanarch
@@ -64,9 +64,13 @@ fre = re.compile(r'[\041-\071\073-\0176]+')
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/clone_member b/bin/clone_member
index 8d9a54b6a..5861aff56 100755
--- a/bin/clone_member
+++ b/bin/clone_member
@@ -77,9 +77,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/config_list b/bin/config_list
index 711d7648a..e0f1b4826 100644
--- a/bin/config_list
+++ b/bin/config_list
@@ -79,9 +79,13 @@ NL = '\n'
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/dumpdb b/bin/dumpdb
index 8286c9dc0..be04385b0 100644
--- a/bin/dumpdb
+++ b/bin/dumpdb
@@ -64,9 +64,13 @@ COMMASPACE = ', '
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__) % globals()
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__) % globals()
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/find_member b/bin/find_member
index 2378ec678..0656d5004 100755
--- a/bin/find_member
+++ b/bin/find_member
@@ -72,9 +72,13 @@ AS_OWNER = 0x02
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/genaliases b/bin/genaliases
index 5474bed81..289c5bec0 100644
--- a/bin/genaliases
+++ b/bin/genaliases
@@ -42,9 +42,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/inject b/bin/inject
index 10192c79f..50deba6a4 100644
--- a/bin/inject
+++ b/bin/inject
@@ -52,9 +52,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/list_admins b/bin/list_admins
index caa58862b..0c4e4ffe4 100644
--- a/bin/list_admins
+++ b/bin/list_admins
@@ -53,9 +53,13 @@ program = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/list_lists b/bin/list_lists
index 77b2f62e3..7318c1727 100644
--- a/bin/list_lists
+++ b/bin/list_lists
@@ -51,9 +51,13 @@ from Mailman.i18n import _
 program = sys.argv[0]
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/list_members b/bin/list_members
index f093c9bfd..b5b91ac29 100755
--- a/bin/list_members
+++ b/bin/list_members
@@ -81,9 +81,13 @@ WHYCHOICES = {'enabled' : MemberAdaptor.ENABLED,
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/mailmanctl b/bin/mailmanctl
index 51be445ef..2bd3db7cf 100644
--- a/bin/mailmanctl
+++ b/bin/mailmanctl
@@ -122,9 +122,13 @@ LogStdErr('error', 'mailmanctl', manual_reprime=0)
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/mmsitepass b/bin/mmsitepass
index 48bd3c2b4..8ae8bc72a 100755
--- a/bin/mmsitepass
+++ b/bin/mmsitepass
@@ -50,9 +50,13 @@ PROGRAM = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/newlist b/bin/newlist
index 240af114e..3a680752f 100755
--- a/bin/newlist
+++ b/bin/newlist
@@ -85,9 +85,13 @@ PROGRAM = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/pygettext.py b/bin/pygettext.py
index a0b687413..d6e1b4f79 100755
--- a/bin/pygettext.py
+++ b/bin/pygettext.py
@@ -183,9 +183,13 @@ msgstr ""
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__) % globals()
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__) % globals()
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/qrunner b/bin/qrunner
index c388435ae..bb2f62d32 100644
--- a/bin/qrunner
+++ b/bin/qrunner
@@ -89,9 +89,13 @@ LogStdErr('error', 'qrunner', manual_reprime=0)
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/remove_members b/bin/remove_members
index a43533c6e..d7e8f0a14 100755
--- a/bin/remove_members
+++ b/bin/remove_members
@@ -61,9 +61,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/rmlist b/bin/rmlist
index 03d46d0f1..ebdeefd93 100755
--- a/bin/rmlist
+++ b/bin/rmlist
@@ -49,9 +49,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/sync_members b/bin/sync_members
index 90f68f98d..e9e23daed 100755
--- a/bin/sync_members
+++ b/bin/sync_members
@@ -93,9 +93,13 @@ from Mailman.i18n import _
 PROGRAM = sys.argv[0]
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/transcheck b/bin/transcheck
index c43382b04..09456655a 100755
--- a/bin/transcheck
+++ b/bin/transcheck
@@ -40,9 +40,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/unshunt b/bin/unshunt
index b1e0655b3..cd8a538e5 100644
--- a/bin/unshunt
+++ b/bin/unshunt
@@ -40,9 +40,13 @@ from Mailman.i18n import _
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/bin/update b/bin/update
index da1031693..94a61aca1 100755
--- a/bin/update
+++ b/bin/update
@@ -523,9 +523,13 @@ NOTE NOTE NOTE NOTE NOTE
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__) % globals()
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__) % globals()
     if msg:
-        print msg
+        print >> sys.stderr, msg
     sys.exit(code)
 
 
diff --git a/bin/withlist b/bin/withlist
index da5c03876..a9bd63611 100644
--- a/bin/withlist
+++ b/bin/withlist
@@ -137,9 +137,13 @@ LOCK = 0
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/cron/bumpdigests b/cron/bumpdigests
index b6078f3f9..3636fc6ec 100644
--- a/cron/bumpdigests
+++ b/cron/bumpdigests
@@ -48,9 +48,13 @@ PROGRAM = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/cron/disabled b/cron/disabled
index 641438000..dcf05f250 100644
--- a/cron/disabled
+++ b/cron/disabled
@@ -86,9 +86,13 @@ PROGRAM = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/cron/gate_news b/cron/gate_news
index ee60c5d2c..3fe466d4a 100755
--- a/cron/gate_news
+++ b/cron/gate_news
@@ -69,10 +69,14 @@ class _ContinueLoop(Exception):
 
 
 def usage(status, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print msg
-    sys.exit(status)
+        print >> fd, msg
+    sys.exit(code)
 
 
 
diff --git a/cron/mailpasswds b/cron/mailpasswds
index 94e19c7b5..5d8b60f6b 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -67,9 +67,13 @@ _ = i18n._
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/cron/nightly_gzip b/cron/nightly_gzip
index 6c532e754..61b641848 100644
--- a/cron/nightly_gzip
+++ b/cron/nightly_gzip
@@ -63,9 +63,13 @@ program = sys.argv[0]
 VERBOSE = 0
 
 def usage(code, msg=''):
-    print __doc__ % globals()
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__) % globals()
     if msg:
-        print msg
+        print >> fd, msg
     sys.exit(code)
 
 
diff --git a/cron/senddigests b/cron/senddigests
index 77fc7a642..5f03606b6 100755
--- a/cron/senddigests
+++ b/cron/senddigests
@@ -48,9 +48,13 @@ PROGRAM = sys.argv[0]
 
 
 def usage(code, msg=''):
-    print >> sys.stderr, _(__doc__)
+    if code:
+        fd = sys.stderr
+    else:
+        fd = sys.stdout
+    print >> fd, _(__doc__)
     if msg:
-        print >> sys.stderr, msg
+        print >> fd, msg
     sys.exit(code)