Skip to content

Commit

Permalink
Blank line contains whitespace: fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
cumbof committed Jun 16, 2017
1 parent 15cc6e4 commit b4fdc27
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/galaxy/webapps/galaxy/controllers/async.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def index(self, trans, tool_id=None, data_secret=None, **kwd):
STATUS = params.STATUS
URL = params.URL
data_id = params.data_id

log.debug('async dataid -> %s' % data_id)
trans.log_event( 'Async dataid -> %s' % str(data_id) )

Expand Down Expand Up @@ -68,7 +68,7 @@ def index(self, trans, tool_id=None, data_secret=None, **kwd):
galaxy_url = trans.request.base + '/async/%s/%s/%s' % ( tool_id, data.id, key )
galaxy_url = params.get("GALAXY_URL", galaxy_url)
params = dict( URL=URL, GALAXY_URL=galaxy_url, name=data.name, info=data.info, dbkey=data.dbkey, data_type=data.ext )

# Assume there is exactly one output file possible
TOOL_OUTPUT_TYPE = None
for idx, obj in enumerate(tool.outputs.values()):
Expand All @@ -81,7 +81,7 @@ def index(self, trans, tool_id=None, data_secret=None, **kwd):
continue
if TOOL_OUTPUT_TYPE is None:
raise Exception( "Error: ToolOutput object not found" )

original_history = trans.sa_session.query( trans.app.model.History ).get( data.history_id )
tool.execute( trans, incoming=params, history=original_history )
else:
Expand Down Expand Up @@ -115,7 +115,7 @@ def index(self, trans, tool_id=None, data_secret=None, **kwd):
continue
if outputs_count > 1:
raise Exception( "Error: the tool should have just one output" )

if GALAXY_TYPE is None:
raise Exception( "Error: ToolOutput object not found" )

Expand Down Expand Up @@ -149,7 +149,7 @@ def index(self, trans, tool_id=None, data_secret=None, **kwd):
galaxy_url = trans.request.base + '/async/%s/%s/%s' % ( tool_id, data.id, key )
params.update( { 'GALAXY_URL': galaxy_url } )
params.update( { 'data_id': data.id } )

# Use provided URL or fallback to tool action
url = URL or tool.action
# Does url already have query params?
Expand Down

0 comments on commit b4fdc27

Please sign in to comment.