1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/d02053706169/ Changeset: d02053706169 User: natefoo Date: 2015-02-09 15:59:36+00:00 Summary: Remove escaping of quotes in the slurm cli status checks, I don't think they should be there (the format args should in fact be quoted). Affected #: 1 file

diff -r bb9de7bc465630eb3f8d055df573a9007f670914 -r d020537061694aabfc7d3786aeec419a0ed318de lib/galaxy/jobs/runners/util/cli/job/slurm.py --- a/lib/galaxy/jobs/runners/util/cli/job/slurm.py +++ b/lib/galaxy/jobs/runners/util/cli/job/slurm.py @@ -7,7 +7,7 @@ except ImportError: # Not in Galaxy, map Galaxy job states to Pulsar ones. from galaxy.util import enum - job_states = enum(RUNNING='running', OK='complete', QUEUED='queued') + job_states = enum(RUNNING='running', OK='complete', QUEUED='queued', ERROR="failed")

from ..job import BaseJobExec

@@ -59,10 +59,10 @@ return 'scancel %s' % job_id

def get_status(self, job_ids=None): - return 'squeue -a -o \"%A %t\"' + return "squeue -a -o '%A %t'"

def get_single_status(self, job_id): - return 'squeue -a -o \"%A %t\" -j ' + job_id + return "squeue -a -o '%A %t' -j " + job_id

def parse_status(self, status, job_ids): # Get status for each job, skipping header. @@ -80,6 +80,7 @@ # Job still on cluster and has state. id, state = status[1].split() return self._get_job_state(state) + # else line like "slurm_load_jobs error: Invalid job id specified" return job_states.OK

def _get_job_state(self, 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.