commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ac2113e38c88/ Changeset: ac2113e38c88 Branch: next-stable User: guerler Date: 2014-11-18 18:51:18+00:00 Summary: Fix parameter validation, catch errors Affected #: 2 files diff -r c1b54085c3aeb9a7cf97c7277436ab3f7b50d299 -r ac2113e38c8843474ceab070643a181caa3b4e20 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1143,7 +1143,7 @@ """ if self.multiple: #split on newline and , - if value: + if isinstance( value, list ) or isinstance( value, basestring ): column_list = [] if not isinstance( value, list ): value = value.split( '\n' ) diff -r c1b54085c3aeb9a7cf97c7277436ab3f7b50d299 -r ac2113e38c8843474ceab070643a181caa3b4e20 lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -626,10 +626,14 @@ group_state['__current_case__'] = current_case group_state[ input.test_param.name ] = value else: - value, error = check_param(trans, input, incoming.get(key, state.get(input.name, None)), context) - if error: - errors[input.name] = error - state[input.name] = value + try: + value, error = check_param(trans, input, incoming.get(key, state.get(input.name, None)), context) + if error: + errors[input.name] = error + state[input.name] = value + except Exception: + log.error('Checking parameter %s failed.', input.name) + pass return errors # builds tool model including all attributes https://bitbucket.org/galaxy/galaxy-central/commits/0ff994584811/ Changeset: 0ff994584811 User: guerler Date: 2014-11-18 18:51:43+00:00 Summary: Merge Affected #: 2 files diff -r 782815ce0a91fb69e82ba73cf811e3487b649d56 -r 0ff9945848112c03bfe2ed2429bba9d1faee703e lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1143,7 +1143,7 @@ """ if self.multiple: #split on newline and , - if value: + if isinstance( value, list ) or isinstance( value, basestring ): column_list = [] if not isinstance( value, list ): value = value.split( '\n' ) diff -r 782815ce0a91fb69e82ba73cf811e3487b649d56 -r 0ff9945848112c03bfe2ed2429bba9d1faee703e lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -626,10 +626,14 @@ group_state['__current_case__'] = current_case group_state[ input.test_param.name ] = value else: - value, error = check_param(trans, input, incoming.get(key, state.get(input.name, None)), context) - if error: - errors[input.name] = error - state[input.name] = value + try: + value, error = check_param(trans, input, incoming.get(key, state.get(input.name, None)), context) + if error: + errors[input.name] = error + state[input.name] = value + except Exception: + log.error('Checking parameter %s failed.', input.name) + pass return errors # builds tool model including all attributes 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