From 71b1ddf7c27f7d2ccbe022b9d3f1f8fb834a7621 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 12 Apr 2016 19:04:43 +0000
Subject: [PATCH] must not use dest file name for transfers
---
.../dm/common/processing/plugins/fileTransferPlugin.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/processing/plugins/fileTransferPlugin.py b/src/python/dm/common/processing/plugins/fileTransferPlugin.py
index 2c2228ac..cb45db43 100755
--- a/src/python/dm/common/processing/plugins/fileTransferPlugin.py
+++ b/src/python/dm/common/processing/plugins/fileTransferPlugin.py
@@ -38,11 +38,11 @@ class FileTransferPlugin(FileProcessor):
def getDestUrl(self, filePath, dataDirectory, storageHost, storageDirectory):
# Use relative path with respect to data directory as a source
- srcUrl = os.path.relpath(filePath, dataDirectory)
+ srcDir = os.path.dirname(os.path.relpath(filePath, dataDirectory))
if self.dest:
- destUrl = '%s/%s' % (self.dest, srcUrl)
+ destUrl = '%s/%s/' % (self.dest, srcDir)
else:
- destUrl = '%s:%s/%s' % (storageHost, storageDirectory, srcUrl)
+ destUrl = '%s:%s/%s/' % (storageHost, storageDirectory, srcDir)
return destUrl
def getSrcDirUrl(self, dataDirectory):
--
GitLab