From 0b91348a73ff07f2b4b2e304b95ead564709fba6 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Sun, 5 Mar 2017 03:12:47 +0000
Subject: [PATCH] more fixes for dest directory
---
.../plugins/gridftpFileTransferPlugin.py | 14 +++++++-------
.../processing/plugins/rsyncFileTransferPlugin.py | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index 1b8544d4..f480597c 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/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)
diff --git a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
index 66c3806b..bbbbd477 100755
--- a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
+++ b/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)
#######################################################################
--
GitLab