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

If a subdir of the library import dir is a symlink and we are linking instead of copying data on import, dereference that symlink

Browse Source
This commit is contained in:
Nate Coraor
2010-04-12 17:24:17 -04:00
parent eeca0c723a
commit 75510d142b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/library_common.py
+13 -2
View File
@@ -915,8 +915,19 @@ class LibraryCommon( BaseController ):
for entry in os.listdir( full_dir ):
# Only import regular files
path = os.path.join( full_dir, entry )
if os.path.islink( path ) and os.path.isfile( path ) and params.get( 'link_data_only', False ):
# If we're linking instead of copying, link the file the link points to, not the link itself.
if os.path.islink( full_dir ) and params.get( 'link_data_only', False ):
# If we're linking instead of copying and the
# sub-"directory" in the import dir is actually a symlink,
# dereference the symlink, but not any of its contents.
link_path = os.readlink( full_dir )
if os.path.isabs( link_path ):
path = os.path.join( link_path, entry )
else:
path = os.path.abspath( os.path.join( link_path, entry ) )
elif os.path.islink( path ) and os.path.isfile( path ) and params.get( 'link_data_only', False ):
# If we're linking instead of copying and the "file" in the
# sub-directory of the import dir is actually a symlink,
# dereference the symlink (one dereference only, Vasili).
link_path = os.readlink( path )
if os.path.isabs( link_path ):
path = link_path