[Gug-cvs] gug/gug/client storage.py,1.45,1.46

[Gergo C. <cs...@us...>]

Update of /cvsroot/gug/gug/gug/client
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6189/client

Modified Files:
	storage.py 
Log Message:
mv/rename facelift



Index: storage.py
===================================================================
RCS file: /cvsroot/gug/gug/gug/client/storage.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** storage.py	3 Apr 2007 12:37:17 -0000	1.45
--- storage.py	22 May 2007 07:15:44 -0000	1.46
***************
*** 430,442 ****
                    "move from/to local disk not implemented yet"
          stm = self._stm()
!         try:
!             stat = stm.stat(target)
!             if stat['dirlike']:
!                 # if exists and is a directory, try to move into it
!                 target = '/'.join([target, source.split('/')[-1]])
!             else:
!                 raise ExistingLFNException, target
!         except InvalidCatalogEntryException:
!             pass
          if target.startswith(source + '/') or target == source:
              raise GeneralStorageException, \
--- 430,443 ----
                    "move from/to local disk not implemented yet"
          stm = self._stm()
! 	if stm.exists(target):
!     	    try:
!         	stat = stm.stat(target)
!         	if stat['dirlike']:
!             	    # if exists and is a directory, try to move into it
!             	    target = '/'.join([target, source.split('/')[-1]])
!     		else:
!             	    raise ExistingLFNException, target
!     	    except InvalidCatalogEntryException:
!         	pass
          if target.startswith(source + '/') or target == source:
              raise GeneralStorageException, \