[Spambayes-checkins] spambayes rebal.py,1.4,1.5

[Tim Peters]

Update of /cvsroot/spambayes/spambayes
In directory usw-pr-cvs1:/tmp/cvs-serv31474

Modified Files:
	rebal.py 
Log Message:
Stopped making -Q imply -q:  these are very different kinds of messages,
and it wasn't at all clear from the docs that -Q would imply -q.


Index: rebal.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/rebal.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rebal.py	21 Sep 2002 14:15:30 -0000	1.4
--- rebal.py	21 Sep 2002 21:19:40 -0000	1.5
***************
*** 9,17 ****
     -r res - specify an alternate reservoir [%(RESDIR)s]
     -s set - specify an alternate Set pfx [%(SETPFX)s]
!    -n num - specify number of files per dir [%(NPERDIR)s]
     -v     - tell user what's happening [%(VERBOSE)s]
     -q     - be quiet about what's happening [not %(VERBOSE)s]
     -c     - confirm file moves into Set directory [%(CONFIRM)s]
!    -Q     - be quiet and don't confirm moves
  
  The script will work with a variable number of Set directories, but they
--- 9,17 ----
     -r res - specify an alternate reservoir [%(RESDIR)s]
     -s set - specify an alternate Set pfx [%(SETPFX)s]
!    -n num - specify number of files per Set dir desired [%(NPERDIR)s]
     -v     - tell user what's happening [%(VERBOSE)s]
     -q     - be quiet about what's happening [not %(VERBOSE)s]
     -c     - confirm file moves into Set directory [%(CONFIRM)s]
!    -Q     - don't confirm moves; this is independent of -v/-q
  
  The script will work with a variable number of Set directories, but they
***************
*** 104,108 ****
              verbose = False
          elif opt == "-Q":
!             verbose = confirm = False
          elif opt == "-h":
              usage()
--- 104,108 ----
              verbose = False
          elif opt == "-Q":
!             confirm = False
          elif opt == "-h":
              usage()