merge from 1.1

src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py

@@ -77,17 +77,17 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
         self.logger.debug('Replacement dir path: %s' % replacementDirPath)
         self.logger.debug('Number of original files: %s' % len(filePathsDict))
         ftpUtility = SftpUtility(storageHost)
-        destDirectory = storageDirectory
+        targetDirectory = storageDirectory
         if destDirectory:
-            destDirectory = '%s/%s/' % (destDirectory, destDirectory)
+            targetDirectory = '%s/%s/' % (storageDirectory, destDirectory)
         storageFilePathsDict = {}
         try:
-            self.logger.debug('Looking for existing files in %s' % destDirectory)
-            storageFilePathsDict = ftpUtility.getFiles(destDirectory, {}, replacementDirPath)
-            self.logger.debug('There are %s files in %s' % (len(storageFilePathsDict), destDirectory))
+            self.logger.debug('Looking for existing files in %s' % targetDirectory)
+            storageFilePathsDict = ftpUtility.getFiles(targetDirectory, {}, replacementDirPath)
+            self.logger.debug('There are %s files in %s' % (len(storageFilePathsDict), targetDirectory))
         except Exception, ex:
-            self.logger.warn('Could not find existing files in %s, assuming there are none (got error: %s)' % (destDirectory,ex))
-
+            self.logger.warn('Could not find existing files in %s, assuming there are none (got error: %s)' % (targetDirectory,ex))
+        
         # Remove file from plugin dict if we do not need to transfer it
         for (filePath,storageFilePathDict) in storageFilePathsDict.items():
             filePathDict = filePathsDict.get(filePath)

src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py

@@ -76,8 +76,8 @@ class RsyncFileTransferPlugin(FileTransferPlugin):
         self.logger.debug('Starting transfer: %s -> %s' % (srcUrl, destUrl))
         command = self.command
         if destDirectory:
-            destDirectory = '%s/%s' % (storageDirectory,destDirectory)
-            command = self.RSYNC_WITH_MKDIR_COMMAND % destDirectory
+            targetDirectory = '%s/%s' % (storageDirectory,destDirectory)
+            command = self.RSYNC_WITH_MKDIR_COMMAND % targetDirectory
         self.start(src=srcUrl, dest=destUrl, command=command, templateInfo=fileInfo, cwd=dataDirectory)
 
         # Get remote checksum
@@ -116,8 +116,8 @@ class RsyncFileTransferPlugin(FileTransferPlugin):
         self.logger.debug('Starting transfer: %s -> %s' % (srcUrl, destUrl))
         command = self.DIRECTORY_TRANSFER_COMMAND
         if destDirectory:
-            destDirectory = '%s/%s' % (storageDirectory,destDirectory)
-            command = self.DIRECTORY_TRANSFER_WITH_MKDIR_COMMAND % destDirectory
+            targetDirectory = '%s/%s' % (storageDirectory,targetDirectory)
+            command = self.DIRECTORY_TRANSFER_WITH_MKDIR_COMMAND % targetDirectory
         self.start(src=srcUrl, dest=destUrl, command=command, templateInfo=uploadInfo, cwd=dataDirectory)
 
 #######################################################################