[Cvsshell-devel] CVS: cvsshell/src app.py,1.15,1.16 cvs_shell.py,1.33,1.34

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

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

Modified Files:
	app.py cvs_shell.py 
Log Message:
fixed bug that crashed cvs shell if the pager exited with an error


Index: app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/app.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** app.py	16 Sep 2002 06:49:32 -0000	1.15
--- app.py	16 Sep 2002 06:57:30 -0000	1.16
***************
*** 229,233 ****
              res = None
          if exitCode is not None:
!             raise ShellException(exitCode)
          return res
  
--- 229,233 ----
              res = None
          if exitCode is not None:
!             raise ShellException(exitCode >> 8)
          return res
  
***************
*** 284,285 ****
--- 284,288 ----
          GetSetProvider.__init__(self)
          self.exitCode = exitCode
+ 
+     def __repr__(self):
+         return 'shell command terminated with exit-code %d' % self.exitCode

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** cvs_shell.py	16 Sep 2002 06:49:32 -0000	1.33
--- cvs_shell.py	16 Sep 2002 06:57:30 -0000	1.34
***************
*** 241,245 ****
                  open(tmp,'w').write(s)
                  self.shell(pager + ' ' + tmp)
!             except (IOError,OSError), msg:
                  self.printMsg(s, nonl=1)
                  self.printErr("Error invoking pager `%s': %s" %
--- 241,245 ----
                  open(tmp,'w').write(s)
                  self.shell(pager + ' ' + tmp)
!             except (ShellException,IOError,OSError), msg:
                  self.printMsg(s, nonl=1)
                  self.printErr("Error invoking pager `%s': %s" %