From 0ea34972455c2d8575f71f3930dea546380d24aa Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 29 Jan 2016 20:55:42 +0000
Subject: [PATCH] make sure replacement directory does not contain scheme
---
.../dm/common/processing/plugins/gridftpFileTransferPlugin.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index 99ac03fe..d4ac844a 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -44,11 +44,11 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
storageDirectory = uploadInfo['storageDirectory']
dataDirectory = uploadInfo['dataDirectory']
self.logger.debug('Upload info: %s', uploadInfo)
- #(scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(storageUrl, defaultPort=self.DEFAULT_PORT)
+ (scheme, host, port, storageDirPath) = FtpUtility.parseFtpUrl(storageUrl)
ftpUtility = SftpUtility(storageHost)
self.logger.debug("STORAGE DIR: %s", storageDirectory)
self.logger.debug("STORAGE HOST: %s", storageHost)
- storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, dataDirectory)
+ storageFilePathsDict = ftpUtility.getFiles(storageDirectory, {}, storageDirPath)
self.logger.debug("STORAGE PATHS: %s", storageFilePathsDict)
self.logger.debug("ORIG PATHS: %s", filePathsDict)
pluginFilePathsDict = {}
--
GitLab