commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/56be13c43a4e/ Changeset: 56be13c43a4e Branch: stable User: jmchilton Date: 2014-03-26 15:24:08 Summary: Fix NoneType exception when using LWR with old-style tool runner URLs. Affected #: 1 file diff -r 6007992cbcd3626cbed38b0e883f516b016f98be -r 56be13c43a4e8c1ad391eab212982659e4845d94 lib/galaxy/jobs/runners/lwr.py --- a/lib/galaxy/jobs/runners/lwr.py +++ b/lib/galaxy/jobs/runners/lwr.py @@ -156,7 +156,8 @@ job_id = "%s_%s" % (job_id, job_wrapper.task_id) params = job_wrapper.job_destination.params.copy() for key, value in params.iteritems(): - params[key] = model.User.expand_user_properties( job_wrapper.get_job().user, value ) + if value: + params[key] = model.User.expand_user_properties( job_wrapper.get_job().user, value ) return self.get_client( params, job_id ) def get_client_from_state(self, job_state): https://bitbucket.org/galaxy/galaxy-central/commits/62146f92190c/ Changeset: 62146f92190c User: jmchilton Date: 2014-03-26 15:27:44 Summary: Merge latest stable. Affected #: 1 file diff -r 66c7385957303447c8f5bb96731945bba179c83a -r 62146f92190c00c621a3ce2ed7860f3f0c2c7ec4 lib/galaxy/jobs/runners/lwr.py --- a/lib/galaxy/jobs/runners/lwr.py +++ b/lib/galaxy/jobs/runners/lwr.py @@ -220,7 +220,8 @@ job_id = "%s_%s" % (job_id, job_wrapper.task_id) params = job_wrapper.job_destination.params.copy() for key, value in params.iteritems(): - params[key] = model.User.expand_user_properties( job_wrapper.get_job().user, value ) + if value: + params[key] = model.User.expand_user_properties( job_wrapper.get_job().user, value ) return self.get_client( params, job_id ) def get_client_from_state(self, job_state): 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