3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3d8841746ce9/ Changeset: 3d8841746ce9 Branch: stable User: Dave Bouvier Date: 2013-11-12 21:36:13 Summary: Fix display of status images for installed tool shed repositories when using a proxy prefix. Affected #: 1 file diff -r 093626ae621f73b9cf904c935eddae98a8823839 -r 3d8841746ce9b65e19a44028dea2eac73a4eddf8 lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py --- a/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py +++ b/lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py @@ -2,6 +2,7 @@ from galaxy import model, util from galaxy.web.framework.helpers import iff, grids +from galaxy.web import url_for from galaxy.model.orm import or_ import tool_shed.util.shed_util_common as suc from tool_shed.util import tool_dependency_util @@ -13,42 +14,42 @@ deprecated_tip_str = 'class="icon-button" title="This repository is deprecated in the Tool Shed"' else: deprecated_tip_str = '' - return '<img src="/static/images/icon_error_sml.gif" %s/>' % deprecated_tip_str + return '<img src="%s/images/icon_error_sml.gif" %s/>' % ( url_for( '/static' ), deprecated_tip_str ) def generate_includes_workflows_img_str( include_mouse_over=False ): if include_mouse_over: deprecated_tip_str = 'class="icon-button" title="This repository contains exported workflows"' else: deprecated_tip_str = '' - return '<img src="/static/images/fugue/gear.png" %s/>' % deprecated_tip_str + return '<img src="%s/images/fugue/gear.png" %s/>' % ( url_for( '/static' ), deprecated_tip_str ) def generate_latest_revision_img_str( include_mouse_over=False ): if include_mouse_over: latest_revision_tip_str = 'class="icon-button" title="This is the latest installable revision of this repository"' else: latest_revision_tip_str = '' - return '<img src="/static/june_2007_style/blue/ok_small.png" %s/>' % latest_revision_tip_str + return '<img src="%s/june_2007_style/blue/ok_small.png" %s/>' % ( url_for( '/static' ), latest_revision_tip_str ) def generate_revision_updates_img_str( include_mouse_over=False ): if include_mouse_over: revision_updates_tip_str = 'class="icon-button" title="Updates are available in the Tool Shed for this revision"' else: revision_updates_tip_str = '' - return '<img src="/static/images/icon_warning_sml.gif" %s/>' % revision_updates_tip_str + return '<img src="%s/images/icon_warning_sml.gif" %s/>' % ( url_for( '/static' ), revision_updates_tip_str ) def generate_revision_upgrades_img_str( include_mouse_over=False ): if include_mouse_over: revision_upgrades_tip_str = 'class="icon-button" title="A newer installable revision is available for this repository"' else: revision_upgrades_tip_str = '' - return '<img src="/static/images/up.gif" %s/>' % revision_upgrades_tip_str + return '<img src="%s/images/up.gif" %s/>' % ( url_for( '/static' ), revision_upgrades_tip_str ) def generate_unknown_img_str( include_mouse_over=False ): if include_mouse_over: unknown_tip_str = 'class="icon-button" title="Unable to get information from the Tool Shed"' else: unknown_tip_str = '' - return '<img src="/static/june_2007_style/blue/question-octagon-frame.png" %s/>' % unknown_tip_str + return '<img src="%s/june_2007_style/blue/question-octagon-frame.png" %s/>' % ( url_for( '/static' ), unknown_tip_str ) class InstalledRepositoryGrid( grids.Grid ): https://bitbucket.org/galaxy/galaxy-central/commits/84f9600dc305/ Changeset: 84f9600dc305 Branch: stable User: jmchilton Date: 2013-11-15 15:20:06 Summary: Fix small typo in 9ce5afd (tool shed autoconf action). Affected #: 1 file diff -r 3d8841746ce9b65e19a44028dea2eac73a4eddf8 -r 84f9600dc305cd5d47aef72f260826f89e6872eb lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -505,7 +505,7 @@ if 'prefix=' in configure_opts: pre_cmd = './configure %s && make && make install' % configure_opts else: - pre_cmd = './configure prefix=$INSTALL_DIR %s && make && make install' % configure_opts + pre_cmd = './configure --prefix=$INSTALL_DIR %s && make && make install' % configure_opts cmd = install_environment.build_command( td_common_util.evaluate_template( pre_cmd, install_dir ) ) return_code = handle_command( app, tool_dependency, install_dir, cmd ) if return_code: https://bitbucket.org/galaxy/galaxy-central/commits/69f348f4b3c7/ Changeset: 69f348f4b3c7 User: jmchilton Date: 2013-11-15 15:20:36 Summary: Merge latest stable. Affected #: 2 files diff -r 1560813167c0072773738cdf57103ecc0191b327 -r 69f348f4b3c7fac9c406b1666309f82810566802 lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py --- a/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py +++ b/lib/tool_shed/galaxy_install/tool_dependencies/fabric_util.py @@ -655,7 +655,7 @@ if 'prefix=' in configure_opts: pre_cmd = './configure %s && make && make install' % configure_opts else: - pre_cmd = './configure prefix=$INSTALL_DIR %s && make && make install' % configure_opts + pre_cmd = './configure --prefix=$INSTALL_DIR %s && make && make install' % configure_opts cmd = install_environment.build_command( td_common_util.evaluate_template( pre_cmd, install_dir ) ) return_code = handle_command( app, tool_dependency, install_dir, cmd ) if return_code: 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.