From 978eb5b0e41e24f0fec159b350c572e6cf7f3073 Mon Sep 17 00:00:00 2001 From: Sinisa Veseli <sveseli@aps.anl.gov> Date: Tue, 26 Jan 2016 18:34:11 +0000 Subject: [PATCH] fix spaces; comment out deleting file from gridftp plugin --- .../processing/plugins/gridftpFileTransferPlugin.py | 8 ++++---- .../common/processing/plugins/rsyncFileTransferPlugin.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py index 3b5e84bf..cc9004dd 100755 --- a/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/gridftpFileTransferPlugin.py @@ -85,7 +85,7 @@ class GridftpFileTransferPlugin(FileTransferPlugin): # Calculate checksum (scheme, host, port, dirPath) = FtpUtility.parseFtpUrl(dataDirectory, defaultPort=self.DEFAULT_PORT) ftpUtility = FtpUtility(host, port) - ftpUtility.statFile(filePath, fileInfo) + ftpUtility.statFile(filePath, fileInfo) if self.localMd5Sum: ftpUtility.getMd5Sum(filePath, fileInfo) @@ -110,9 +110,9 @@ class GridftpFileTransferPlugin(FileTransferPlugin): self.logger.debug('Checksum test passed for file %s' % filePath) # Remove file - if self.deleteOriginal: - self.logger.debug('Deleting file %s' % filePath) - OsUtility.removeFile(srcUrl) + #if self.deleteOriginal: + # self.logger.debug('Deleting file %s' % filePath) + # OsUtility.removeFile(srcUrl) ####################################################################### # Testing. diff --git a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py index 525ad752..aa5c4d31 100755 --- a/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py +++ b/src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py @@ -54,7 +54,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin): srcUrl = self.getSrcUrl(filePath, dataDirectory) # Calculate checksum - FileUtility.statFile(filePath, fileInfo) + FileUtility.statFile(filePath, fileInfo) if self.localMd5Sum: FileUtility.statFile(filePath, fileInfo) FileUtility.getMd5Sum(filePath, fileInfo) -- GitLab