[Cvsshell-devel] CVS: cvsshell/src basic_cmds.py,1.6,1.7

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

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

Modified Files:
	basic_cmds.py 
Log Message:
Fixed some problems



Index: basic_cmds.py
===================================================================
RCS file: /cvsroot/cvsshell/cvsshell/src/basic_cmds.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** basic_cmds.py	7 Mar 2002 12:35:06 -0000	1.6
--- basic_cmds.py	7 Mar 2002 12:59:28 -0000	1.7
***************
*** 153,157 ****
  def add(name, args, context):
      app = context['APP']
!     if args == '':
          args = app.prompt('enter filenumbers to add: ')
          if args is None: return
--- 153,157 ----
  def add(name, args, context):
      app = context['APP']
!     if not args:
          args = app.prompt('enter filenumbers to add: ')
          if args is None: return
***************
*** 196,200 ****
          if args is None: return
      def __doIt(e,filename):
!         return filename
      (rootDir, toDelete) = _applyOnEntryList(args, context, __doIt)
      toDeleteList = utils.Listing(rootDir, toDelete)
--- 196,200 ----
          if args is None: return
      def __doIt(e,filename):
!         return e
      (rootDir, toDelete) = _applyOnEntryList(args, context, __doIt)
      toDeleteList = utils.Listing(rootDir, toDelete)
***************
*** 207,211 ****
              app.printErr(msg)
          else:
!             filenames.append(name)
              e.status = utils.Entry.S_REMOVED
      if filenames:
--- 207,211 ----
              app.printErr(msg)
          else:
!             filenames.append(os.path.join(e.dir, e.name))
              e.status = utils.Entry.S_REMOVED
      if filenames:
***************
*** 287,303 ****
      (rootdir of listing, list with the return values from fun)."""
      app = context['APP']
      try:
          nums = utils.getNumbers(opts)
      except utils.ParseError, msg:
          app.printErr(msg)
!         return
      if len(nums) == 0:
          app.printMsg('No files specified.')
!         return
      try:
          listing = context['basic_cmds.listing']
      except KeyError:
          app.printErr(noListingErrMsg)
!         return
      result = []
      for x in nums:
--- 287,304 ----
      (rootdir of listing, list with the return values from fun)."""
      app = context['APP']
+     defRet = (None, None)
      try:
          nums = utils.getNumbers(opts)
      except utils.ParseError, msg:
          app.printErr(msg)
!         return defRet
      if len(nums) == 0:
          app.printMsg('No files specified.')
!         return defRet
      try:
          listing = context['basic_cmds.listing']
      except KeyError:
          app.printErr(noListingErrMsg)
!         return defRet
      result = []
      for x in nums: