From c98a20c609a6d215163096c2993a8698508125e1 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 29 Jan 2016 20:58:23 +0000
Subject: [PATCH] make sure replacement directory does not contain scheme
---
.../dm/common/processing/plugins/gridftpFileTransferPlugin.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
index d4ac844a..11942b9c 100755
--- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py
@@ -44,7 +44,8 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
storageDirectory = uploadInfo['storageDirectory']
dataDirectory = uploadInfo['dataDirectory']
self.logger.debug('Upload info: %s', uploadInfo)
- (scheme, host, port, storageDirPath) = FtpUtility.parseFtpUrl(storageUrl)
+ # Storage directory may contain host/port
+ (scheme, host, port, storageDirPath) = FtpUtility.parseFtpUrl(storageDirectory)
ftpUtility = SftpUtility(storageHost)
self.logger.debug("STORAGE DIR: %s", storageDirectory)
self.logger.debug("STORAGE HOST: %s", storageHost)
--
GitLab