1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/b729f8f23f7a/ changeset: b729f8f23f7a user: natefoo date: 2011-12-06 19:01:03 summary: Bugfix for the previous commit. affected #: 3 files
diff -r 5f044d41a8a74af74f36d020206f9807c55f0d34 -r b729f8f23f7aeb2c3005f6b260af5a49c38ac230 lib/galaxy/jobs/__init__.py --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -700,7 +700,7 @@ util.umask_fix_perms( path, self.app.config.umask, 0666, self.app.config.gid ) self.sa_session.flush() log.debug( 'job %d ended' % self.job_id ) - if self.app.config.cleanup_job in ( 'always', 'onsuccess' ): + if self.app.config.cleanup_job == 'always' or ( not stderr and self.app.config.cleanup_job == 'onsuccess' ): self.cleanup()
def cleanup( self ):
diff -r 5f044d41a8a74af74f36d020206f9807c55f0d34 -r b729f8f23f7aeb2c3005f6b260af5a49c38ac230 lib/galaxy/jobs/runners/drmaa.py --- a/lib/galaxy/jobs/runners/drmaa.py +++ b/lib/galaxy/jobs/runners/drmaa.py @@ -290,7 +290,7 @@ log.exception("Job wrapper finish method failed")
# clean up the drm files - if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" )): + if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" ): self.cleanup( ( ofile, efile, job_file ) )
def fail_job( self, drm_job_state ):
diff -r 5f044d41a8a74af74f36d020206f9807c55f0d34 -r b729f8f23f7aeb2c3005f6b260af5a49c38ac230 lib/galaxy/jobs/runners/pbs.py --- a/lib/galaxy/jobs/runners/pbs.py +++ b/lib/galaxy/jobs/runners/pbs.py @@ -519,7 +519,7 @@ pbs_job_state.job_wrapper.fail("Unable to finish job", exception=True)
# clean up the pbs files - if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" )): + if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" ): self.cleanup( ( ofile, efile, job_file ) )
def fail_job( self, pbs_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.