From 8b4ebbe24796769a7d663290fbe3985f3d2d3ab0 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 18 Dec 2008 17:52:56 +0000
Subject: [PATCH] fix to handle the new wckey in 1.4
---
src/salloc/salloc.c | 4 +---
src/sbatch/sbatch.c | 5 ++---
src/srun/allocate.c | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index 23d7577e5ac..95c6de7587e 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -336,9 +336,7 @@ static int fill_job_desc_from_opts(job_desc_msg_t *desc)
desc->features = opt.constraints;
desc->immediate = opt.immediate ? 1 : 0;
desc->name = xstrdup(opt.job_name);
-
- if(opt.wckey)
- xstrfmtcat(desc->name, "\"%s", opt.wckey);
+ desc->wckey = xstrdup(opt.wckey);
desc->req_nodes = opt.nodelist;
desc->exc_nodes = opt.exc_nodes;
diff --git a/src/sbatch/sbatch.c b/src/sbatch/sbatch.c
index bf1ad04794e..685cb9f434e 100644
--- a/src/sbatch/sbatch.c
+++ b/src/sbatch/sbatch.c
@@ -146,9 +146,8 @@ static int fill_job_desc_from_opts(job_desc_msg_t *desc)
desc->name = xstrdup(opt.job_name);
else
desc->name = xstrdup("sbatch");
-
- if(opt.wckey)
- xstrfmtcat(desc->name, "\"%s", opt.wckey);
+
+ desc->wckey = xstrdup(opt.wckey);
desc->req_nodes = opt.nodelist;
desc->exc_nodes = opt.exc_nodes;
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index eb9119deb1d..b39775f155f 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -344,8 +344,7 @@ job_desc_msg_create_from_opts ()
else
j->name = xstrdup(opt.cmd_name);
- if (opt.wckey)
- xstrfmtcat(j->name, "\"%s", opt.wckey);
+ j->wckey = xstrdup(opt.wckey);
j->req_nodes = xstrdup(opt.nodelist);
--
GitLab