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 pull request #939 from nsoranzo/debug_for_792

Browse Source 
Add a log.warn() if extracted file does not exist when changing permissions.
This commit is contained in:
Martin Cech
2015-10-19 12:05:01 -04:00
parent 123bf620df 20579ebd50
commit 347b1596a8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/galaxy_install/tool_dependencies/recipe/step_handler.py
+6 -3
View File
@@ -53,7 +53,7 @@ class CompressedFile( object ):
def extract( self, path ):
'''Determine the path to which the archive should be extracted.'''
contents = self.getmembers()
extraction_path = os.path.join( path )
extraction_path = path
common_prefix = ''
if len( contents ) == 1:
# The archive contains a single file, return the extraction path.
@@ -84,8 +84,11 @@ class CompressedFile( object ):
external_attributes = self.archive.getinfo( filename ).external_attr
# The 2 least significant bytes are irrelevant, the next two contain unix permissions.
unix_permissions = external_attributes >> 16
if unix_permissions != 0 and os.path.exists( absolute_filepath ):
os.chmod( absolute_filepath, unix_permissions )
if unix_permissions != 0:
if os.path.exists( absolute_filepath ):
os.chmod( absolute_filepath, unix_permissions )
else:
log.warn("Unable to change permission on extracted file '%s' as it does not exist" % absolute_filepath)
return os.path.abspath( os.path.join( extraction_path, common_prefix ) )
def getmembers_tar( self ):