commit/galaxy-central: greg: Include the galaxy_url param in the new request to the tool shed.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/bc5cd95d042b/ Changeset: bc5cd95d042b User: greg Date: 2013-05-12 17:05:49 Summary: Include the galaxy_url param in the new request to the tool shed. Affected #: 1 file diff -r dc7d35578676935777d1f315693a4c15498919e8 -r bc5cd95d042bc062c688bee6b3e9cbf74d853fb1 lib/tool_shed/util/common_install_util.py --- a/lib/tool_shed/util/common_install_util.py +++ b/lib/tool_shed/util/common_install_util.py @@ -299,8 +299,11 @@ fh.write( encoded_required_repository_str ) fh.close() encoded_tmp_file_name = encoding_util.tool_shed_encode( os.path.abspath( tmp_file_name ) ) + galaxy_url = web.url_for( '/', qualified=True ) # Send a request to the tool shed to enable it to read the temporary file. - url = suc.url_join( tool_shed_url, '/repository/get_required_repo_info_dict?encoded_tmp_file_name=%s' % encoded_tmp_file_name ) + url = suc.url_join( tool_shed_url, + '/repository/get_required_repo_info_dict?encoded_tmp_file_name=%s&galaxy_url=%s' % \ + ( encoded_tmp_file_name, galaxy_url ) ) else: encoded_tmp_file_name = None tmp_file_name = None @@ -311,7 +314,7 @@ message = 'The selected tool shed repositories cannot be installed until the tool shed at ' message += '%s and the Galaxy instance at %s ' % ( str( tool_shed_url ), str( trans.request.base ) ) message += 'are both updated to at least the June 3, 2013 Galaxy release. These upgrades ' - message += 'are necessary because the number of repositories you are attemping to install ' + message += 'are necessary because the number of repositories you are attempting to install ' message += 'generates an HTTP request that is longer than 8177 bytes which cannot be handled ' message += 'by tool shed or Galaxy instances older than this release.' log.debug( message ) 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