aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsapiro <>2005-12-02 01:58:04 +0000
committermsapiro <>2005-12-02 01:58:04 +0000
commite827c436aad1b9809e6b4b6b450f2040e29d1197 (patch)
treed8114eb5cbe3daf9251f9936d07adc43e05ade44
parentd588214c9fb07cb20ee522d4fb103d12e35b7309 (diff)
downloadmailman2-e827c436aad1b9809e6b4b6b450f2040e29d1197.tar.gz
mailman2-e827c436aad1b9809e6b4b6b450f2040e29d1197.tar.xz
mailman2-e827c436aad1b9809e6b4b6b450f2040e29d1197.zip
Arg checking too agressive - didn't allow 0 args with --fromall and --file=
-rwxr-xr-xbin/remove_members8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/remove_members b/bin/remove_members
index af5e487e..efd91ff4 100755
--- a/bin/remove_members
+++ b/bin/remove_members
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2005 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -110,9 +110,6 @@ def main():
except getopt.error, msg:
usage(1, msg)
- if len(args) < 1:
- usage(1)
-
filename = None
all = False
alllists = False
@@ -134,6 +131,9 @@ def main():
elif opt in ('-N', '--noadminack'):
admin_notif = False
+ if len(args) < 1 and not (filename and alllists):
+ usage(1)
+
# You probably don't want to delete all the users of all the lists -- Marc
if all and alllists:
usage(1)