Skip to content
Snippets Groups Projects
Commit de9f5eba authored by sveseli's avatar sveseli
Browse files

make sure replacement directory does not contain scheme

parent c98a20c6
No related branches found
No related tags found
No related merge requests found
...@@ -44,12 +44,12 @@ class GridftpFileTransferPlugin(FileTransferPlugin): ...@@ -44,12 +44,12 @@ class GridftpFileTransferPlugin(FileTransferPlugin):
storageDirectory = uploadInfo['storageDirectory'] storageDirectory = uploadInfo['storageDirectory']
dataDirectory = uploadInfo['dataDirectory'] dataDirectory = uploadInfo['dataDirectory']
self.logger.debug('Upload info: %s', uploadInfo) self.logger.debug('Upload info: %s', uploadInfo)
# Storage directory may contain host/port # Original data directory may contain host/port
(scheme, host, port, storageDirPath) = FtpUtility.parseFtpUrl(storageDirectory) (scheme, host, port, replacementDirPath) = FtpUtility.parseFtpUrl(dataDirectory)
ftpUtility = SftpUtility(storageHost) ftpUtility = SftpUtility(storageHost)
self.logger.debug("STORAGE DIR: %s", storageDirectory) self.logger.debug("STORAGE DIR: %s", storageDirectory)
self.logger.debug("STORAGE HOST: %s", storageHost) 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("STORAGE PATHS: %s", storageFilePathsDict)
self.logger.debug("ORIG PATHS: %s", filePathsDict) self.logger.debug("ORIG PATHS: %s", filePathsDict)
pluginFilePathsDict = {} pluginFilePathsDict = {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment