1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2a5554c53aea/ Changeset: 2a5554c53aea User: natefoo Date: 2013-08-05 23:15:31 Summary: Merge next-stable. Affected #: 1 file diff -r 20e2d056b843504ea77c49adc0cb08818bb7bdc6 -r 2a5554c53aead0373e26eacdffc75e5c713bd721 lib/galaxy/jobs/runners/pbs.py --- a/lib/galaxy/jobs/runners/pbs.py +++ b/lib/galaxy/jobs/runners/pbs.py @@ -588,8 +588,8 @@ def stop_job( self, job ): """Attempts to delete a job from the PBS queue""" - job_tag = ( "(%s/%s)" - % ( job.get_id_tag(), job.get_job_runner_external_id() ) ) + job_id = job.get_job_runner_external_id().encode('utf-8') + job_tag = "(%s/%s)" % ( job.get_id_tag(), job_id ) log.debug( "%s Stopping PBS job" % job_tag ) # Declare the connection handle c so that it can be cleaned up: @@ -606,7 +606,7 @@ log.debug("(%s) Connection to PBS server for job delete failed" % job_tag ) return - pbs.pbs_deljob( c, job.get_job_runner_external_id(), '' ) + pbs.pbs_deljob( c, job_id, '' ) log.debug( "%s Removed from PBS queue before job completion" % job_tag ) except: 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.