opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6497 from martenson/backport-takadonet

Browse Source 
[18.05] backport ftp purge fix
This commit is contained in:
Marius van den Beek
2018-07-13 11:51:09 +02:00
committed by GitHub
parent dfc996c8d6 4b0ae30a83
commit fd33c5c6d6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/data_source/upload.py
+6 -1
View File
@@ -141,7 +141,12 @@ def add_file(dataset, registry, output_path):
# Move the dataset to its "real" path. converted_path is a tempfile so we move it even if purge_source is False.
if purge_source or converted_path:
try:
shutil.move(converted_path or dataset.path, output_path)
# If user has indicated that the original file to be purged and have converted_path tempfile
if purge_source and converted_path:
shutil.move(converted_path, output_path)
os.remove(dataset.path)
else:
shutil.move(converted_path or dataset.path, output_path)
except OSError as e:
# We may not have permission to remove the input
if e.errno != errno.EACCES: