Update of /cvsroot/mailman/mailman/bin
In directory usw-pr-cvs1:/tmp/cvs-serv18757
Modified Files:
add_members
Log Message:
main(): Deprecate -n/--non-digest-members-file in favor of
-r/--regular-members-file. I'd like eventually for -n to be
equivalent to --dry-run, but also this makes add_members a little more
like list_members. Closes SF bug #219658.
Index: add_members
===================================================================
RCS file: /cvsroot/mailman/mailman/bin/add_members,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** add_members 27 Mar 2002 04:30:51 -0000 2.10
--- add_members 6 Apr 2002 05:35:02 -0000 2.11
***************
*** 31,39 ****
Options:
! --non-digest-members-file=file
! -n file
A file containing addresses of the members to be added, one
address per line. This list of people become non-digest
! members. If file is `-', read addresses from stdin.
--digest-members-file=file
--- 31,40 ----
Options:
! --regular-members-file=file
! -r file
A file containing addresses of the members to be added, one
address per line. This list of people become non-digest
! members. If file is `-', read addresses from stdin. Note that
! -n/--non-digest-members-file are deprecated synonyms for this option.
--digest-members-file=file
***************
*** 176,181 ****
try:
opts, args = getopt.getopt(sys.argv[1:],
! 'a:n:d:c:w:h',
['admin-notify=',
'non-digest-members-file=',
'digest-members-file=',
--- 177,183 ----
try:
opts, args = getopt.getopt(sys.argv[1:],
! 'a:n:r:d:c:w:h',
['admin-notify=',
+ 'regular-members-file=',
'non-digest-members-file=',
'digest-members-file=',
***************
*** 200,205 ****
--- 202,214 ----
elif opt in ('-d', '--digest-members-file'):
dfile = arg
+ # Deprecate -/--non-digest-members-file or consistency with
+ # list_members
+ elif opt in ('-r', '--regular-members-file'):
+ nfile = arg
elif opt in ('-n', '--non-digest-members-file'):
nfile = arg
+ # I don't think we need to use the warnings module here.
+ print >> sys.stderr, 'option', opt, \
+ 'is deprecated, use -r/--regular-members-file'
elif opt in ('-c', '--changes-msg'):
if arg.lower()[0] == 'y':
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
