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

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

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

Modified Files:
	app.py cvs_shell.py 
Log Message:
fixed bug with sf id #611206


Index: app.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/app.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** app.py	16 Sep 2002 06:57:30 -0000	1.16
--- app.py	18 Sep 2002 19:07:56 -0000	1.17
***************
*** 220,224 ****
      def shell(self, command, fork=0):
          if self.isVerbose():
!             self.printMsg(command)                        # how about ipc?
          if fork == 1:
              pipe = os.popen(command, 'r')
--- 220,224 ----
      def shell(self, command, fork=0):
          if self.isVerbose():
!             self.printMsg(command)
          if fork == 1:
              pipe = os.popen(command, 'r')
***************
*** 228,233 ****
              exitCode = os.system(command)
              res = None
!         if exitCode is not None:
!             raise ShellException(exitCode >> 8)
          return res
  
--- 228,234 ----
              exitCode = os.system(command)
              res = None
!         exitCode = exitCode >> 8
!         if exitCode:
!             raise ShellException(exitCode)
          return res
  

Index: cvs_shell.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_shell.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** cvs_shell.py	16 Sep 2002 06:57:30 -0000	1.34
--- cvs_shell.py	18 Sep 2002 19:07:56 -0000	1.35
***************
*** 240,244 ****
                  tmp = tempfile.mktemp() 
                  open(tmp,'w').write(s)
!                 self.shell(pager + ' ' + tmp)
              except (ShellException,IOError,OSError), msg:
                  self.printMsg(s, nonl=1)
--- 240,244 ----
                  tmp = tempfile.mktemp() 
                  open(tmp,'w').write(s)
!                 self.shell(pager + ' ' + tmp)            
              except (ShellException,IOError,OSError), msg:
                  self.printMsg(s, nonl=1)