opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge next-stable.

Browse Source
This commit is contained in:
Nate Coraor
2013-08-05 17:15:31 -04:00
parent 6a08822aa0 b88be238c6
commit a90d1d12fe
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/pbs.py
+3 -3
View File
@@ -588,8 +588,8 @@ class PBSJobRunner( AsynchronousJobRunner ):
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 @@ class PBSJobRunner( AsynchronousJobRunner ):
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: