commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9bde6f2b9c59/ Changeset: 9bde6f2b9c59 Branch: stable User: Dave Bouvier Date: 2013-11-13 20:16:29 Summary: Fix for downloading jar files in tool dependencies. Affected #: 1 file diff -r 8b60ec04bea623eeb7ba3b370302cf4e123119d7 -r 9bde6f2b9c59a29a35b85b7fe3c2e3bef3ae6a2e lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py @@ -430,7 +430,7 @@ if dst: dst.close() if extract: - if istar( file_path ) or iszip( file_path ): + if istar( file_path ) or ( iszip( file_path ) and not isjar( file_path ) ): archive = CompressedFile( file_path ) extraction_path = archive.extract( install_dir ) else: https://bitbucket.org/galaxy/galaxy-central/commits/e6b3faf87f02/ Changeset: e6b3faf87f02 User: Dave Bouvier Date: 2013-11-13 20:18:36 Summary: Merge in fix from stable. Affected #: 1 file diff -r 846962cad9648e2a76ba4bd2d6f85079ec78056c -r e6b3faf87f026f03412ff7b1b133fa0872c8be45 lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/td_common_util.py @@ -430,7 +430,7 @@ if dst: dst.close() if extract: - if istar( file_path ) or iszip( file_path ): + if istar( file_path ) or ( iszip( file_path ) and not isjar( file_path ) ): archive = CompressedFile( file_path ) extraction_path = archive.extract( install_dir ) else: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org