From 4d15b0e53e714a584b91437f8e48723b61f79dde Mon Sep 17 00:00:00 2001 From: Morris Jette <jette@schedmd.com> Date: Thu, 12 Sep 2013 16:36:05 -0700 Subject: [PATCH] job_submit/pbs: preserve native Slurm dependencies Also log discarded PBS options --- src/plugins/job_submit/pbs/job_submit_pbs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/job_submit/pbs/job_submit_pbs.c b/src/plugins/job_submit/pbs/job_submit_pbs.c index b0a4b3a51fb..fbfb2146da7 100644 --- a/src/plugins/job_submit/pbs/job_submit_pbs.c +++ b/src/plugins/job_submit/pbs/job_submit_pbs.c @@ -131,10 +131,15 @@ static void _xlate_dependency(struct job_descriptor *job_desc) tok = strtok_r(job_desc->dependency, ",", &last_ptr); while (tok) { - if (!strncmp(tok, "after", 5)) { + if (!strncmp(tok, "after", 5) || + !strncmp(tok, "expand", 6) || + !strncmp(tok, "singleton", 9)) { if (result) xstrcat(result, ","); xstrcat(result, tok); + } else { + info("%s: discarding job dependency option %s", + plugin_type, tok); } tok = strtok_r(NULL, ",", &last_ptr); } -- GitLab