opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_16.01' into release_16.04

Browse Source
This commit is contained in:
Dannon Baker
2016-06-21 14:56:33 -04:00
parent dad193e3c0 67c4df712a
commit 15a4734aed
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
+11 -5
View File
@@ -847,11 +847,17 @@ class MoveDirectoryFiles( RecipeStep ):
def move_directory_files( self, current_dir, source_dir, destination_dir ):
source_directory = os.path.abspath( os.path.join( current_dir, source_dir ) )
destination_directory = os.path.join( destination_dir )
destination_parent_directory = os.path.dirname(destination_directory)
if not os.path.isdir( destination_parent_directory ):
os.makedirs( destination_parent_directory )
shutil.move( source_directory, destination_directory )
destination_directory = os.path.abspath(os.path.join(destination_dir))
if not os.path.isdir(destination_directory):
os.makedirs(destination_directory)
for dir_entry in os.listdir(source_directory):
source_entry = os.path.join(source_directory, dir_entry)
if os.path.islink(source_entry):
destination_entry = os.path.join(destination_directory, dir_entry)
os.symlink(os.readlink(source_entry), destination_entry)
os.remove(source_entry)
else:
shutil.move(source_entry, destination_directory)
def prepare_step( self, tool_dependency, action_elem, action_dict, install_environment, is_binary_download ):
# <action type="move_directory_files">