[Cvsshell-devel] CVS: cvsshell/src cvs_cmds.py,1.11,1.12

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

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

Modified Files:
	cvs_cmds.py 
Log Message:
fixed bug ID 560963


Index: cvs_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/cvs_cmds.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cvs_cmds.py	26 Jul 2002 16:35:37 -0000	1.11
--- cvs_cmds.py	26 Jul 2002 18:12:07 -0000	1.12
***************
*** 271,282 ****
          else:
              rest = answ
-     def __doIt(e,filename):
-         if e.status == Entry.S_REMOVED:
-             e.status = Entry.S_DELETED
-         else:
-             e.status = Entry.S_OK
-         return filename
      try:
!         filenames = app.applyOnEntryList(rest, __doIt)
          try:
              if filenames:
--- 271,276 ----
          else:
              rest = answ
      try:
!         filenames = app.applyOnEntryList(rest, lambda e, fname: fname)
          try:
              if filenames:
***************
*** 284,288 ****
                                globOpts=globOpts,
                                args=opts+' '+string.join(filenames), fork=0)
!         except CvsError: pass
      except utils.ParseError: # args do not spefiy ids in the current listing
          try:
--- 278,288 ----
                                globOpts=globOpts,
                                args=opts+' '+string.join(filenames), fork=0)
!             def __doIt(e,filename):
!                 if e.status == Entry.S_REMOVED:
!                     e.status = Entry.S_DELETED
!                 else:
!                     e.status = Entry.S_OK
!             app.applyOnEntryList(rest, __doIt)
!         except CvsError: return
      except utils.ParseError: # args do not spefiy ids in the current listing
          try:
***************
*** 290,294 ****
                            args=opts+' '+rest, fork=0)
              app.setDirtyListing(1)
!         except CvsError: pass
      except AppError, msg:
          app.printErr(msg)
--- 290,294 ----
                            args=opts+' '+rest, fork=0)
              app.setDirtyListing(1)
!         except CvsError: return
      except AppError, msg:
          app.printErr(msg)