From de9f5eba67923cad8f80557d7993e33f0b80b966 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 29 Jan 2016 21:05:09 +0000
Subject: [PATCH] make sure replacement directory does not contain scheme
---
.../common/processing/plugins/gridftpFileTransferPlugin.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index 11942b9c..7c6d9a04 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -44,12 +44,12 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
storageDirectory = uploadInfo['storageDirectory']
dataDirectory = uploadInfo['dataDirectory']
self.logger.debug('Upload info: %s', uploadInfo)
- # Storage directory may contain host/port
- (scheme, host, port, storageDirPath) = FtpUtility.parseFtpUrl(storageDirectory)
+ # Original data directory may contain host/port
+ (scheme, host, port, replacementDirPath) = FtpUtility.parseFtpUrl(dataDirectory)
ftpUtility = SftpUtility(storageHost)
self.logger.debug("STORAGE DIR: %s", storageDirectory)
self.logger.debug("STORAGE HOST: %s", storageHost)
- storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, storageDirPath)
+ storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, replacementDirPath)
self.logger.debug("STORAGE PATHS: %s", storageFilePathsDict)
self.logger.debug("ORIG PATHS: %s", filePathsDict)
pluginFilePathsDict = {}
--
GitLab