commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/aefe5cf99f92/ Changeset: aefe5cf99f92 Branch: next-stable User: abretaud Date: 2014-02-07 11:51:41 Summary: Fix crash when recovering jobs of a removed tool Affected #: 1 file diff -r deea87095946ea32d28491b44a120bbc94683150 -r aefe5cf99f92eaa3a401f3f7a9edf9dce4027ed1 lib/galaxy/jobs/handler.py --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -107,7 +107,7 @@ if job.tool_id not in self.app.toolbox.tools_by_id: log.warning( "(%s) Tool '%s' removed from tool config, unable to recover job" % ( job.id, job.tool_id ) ) JobWrapper( job, self ).fail( 'This tool was disabled before the job completed. Please contact your Galaxy administrator.' ) - if job.job_runner_name is not None and job.job_runner_external_id is None: + elif job.job_runner_name is not None and job.job_runner_external_id is None: # This could happen during certain revisions of Galaxy where a runner URL was persisted before the job was dispatched to a runner. log.debug( "(%s) Job runner assigned but no external ID recorded, adding to the job handler queue" % job.id ) job.job_runner_name = None https://bitbucket.org/galaxy/galaxy-central/commits/5e2a4255cf09/ Changeset: 5e2a4255cf09 User: natefoo Date: 2014-02-07 15:27:14 Summary: merge. Affected #: 0 files 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