[Cvsshell-devel] CVS: cvsshell/src cvs_cmds.py,1.9,1.10 interactive_app.py,1.8,1.9

[Stefan H. <ste...@us...>]

Update of /cvsroot/cvsshell/cvsshell/src
In directory usw-pr-cvs1:/tmp/cvs-serv26587/src

Modified Files:
	cvs_cmds.py interactive_app.py 
Log Message:
* fixed bug with status/update command (dirnames were not passed to the command)
* KeyboardInterrupt exception is catched at a higher level in interactive_app (no more
  unwanted termination)


Index: cvs_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_cmds.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cvs_cmds.py	26 Jul 2002 15:32:57 -0000	1.9
--- cvs_cmds.py	26 Jul 2002 15:44:25 -0000	1.10
***************
*** 47,51 ****
          return
      try:
!         lines = app.runCvsCmd('status', globOpts=globOpts, args=opts, getStderr=1)
      except CvsError: return
      entries = []
--- 47,51 ----
          return
      try:
!         lines = app.runCvsCmd('status', globOpts=globOpts, args=opts+' '+rest, getStderr=1)
      except CvsError: return
      entries = []
***************
*** 94,98 ****
      if simulate: globOpts += '-n'
      try:
!         lines = app.runCvsCmd('update', globOpts=globOpts, args=opts)
      except CvsError: return
      entries = []
--- 94,98 ----
      if simulate: globOpts += '-n'
      try:
!         lines = app.runCvsCmd('update', globOpts=globOpts, args=opts+' '+rest)
      except CvsError: return
      entries = []

Index: interactive_app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/interactive_app.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** interactive_app.py	3 Jun 2002 07:40:48 -0000	1.8
--- interactive_app.py	26 Jul 2002 15:44:25 -0000	1.9
***************
*** 52,59 ****
      def run(self):
          while 1:
!             command = self.readCommand()
!             if command == None:
!                 break
!             result = self.evalCommand(command)
              if result is self.BREAK_REPL: break
              elif result is None: continue
--- 52,66 ----
      def run(self):
          while 1:
!             try:
!                 command = self.readCommand()
!                 if command == None:
!                     break
!                 result = self.evalCommand(command)
!             except EOFError:
!                 self.printMsg()
!                 return None
!             except KeyboardInterrupt:
!                 self.printMsg()
!                 return None
              if result is self.BREAK_REPL: break
              elif result is None: continue
***************
*** 83,94 ****
              else:
                  msg += '[%s] ' % default    
!         try:
!             a = raw_input(msg)
!         except EOFError:
!             self.printMsg()
!             return None
!         except KeyboardInterrupt:
!             self.printMsg()
!             return None
          a = os.path.expandvars(a)
          a = os.path.expanduser(a)
--- 90,94 ----
              else:
                  msg += '[%s] ' % default    
!         a = raw_input(msg)
          a = os.path.expandvars(a)
          a = os.path.expanduser(a)