Update of /cvsroot/mailman/mailman/bin
In directory usw-pr-cvs1:/tmp/cvs-serv8445

Modified Files:
        withlist 
Log Message:
-i is now optional unless the -r option is given.  IOW, we always drop
into interactive mode unless we --run.


Index: withlist
===================================================================
RCS file: /cvsroot/mailman/mailman/bin/withlist,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -d -r2.8 -r2.9
*** withlist    29 Jan 2002 19:10:48 -0000      2.8
--- withlist    14 Mar 2002 23:42:20 -0000      2.9
***************
*** 45,49 ****
      -i / --interactive
          Leaves you at an interactive prompt after all other processing is
!         complete.
  
      --run [module.]callable
--- 45,49 ----
      -i / --interactive
          Leaves you at an interactive prompt after all other processing is
!         complete.  This is the default unless the -r option is given.
  
      --run [module.]callable
***************
*** 200,204 ****
  
      run = None
!     interact = 0
      all = 0
      for opt, arg in opts:
--- 200,204 ----
  
      run = None
!     interact = None
      all = 0
      for opt, arg in opts:
***************
*** 221,224 ****
--- 221,231 ----
      if all and not run:
          usage(1, _('--all requires --run'))
+ 
+     # The default for interact is 1 unless -r was given
+     if interact is None:
+         if run is None:
+             interact = 1
+         else:
+             interact = 0
  
      # try to import the module for the callable


_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins

Reply via email to