From e18c3d9feff961f7d5024c7cfbdc21f3b4800f4d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 8 Oct 2014 00:57:40 -0500
Subject: [PATCH] correct logic for commit ec8bc207ae
---
src/common/read_config.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 77901c68765..293a1102cce 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -3655,10 +3655,10 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
/* If not running linear default to be CR_CPU */
if (!(conf->select_type_param & (CR_CPU | CR_SOCKET | CR_CORE))
- && (strcmp(conf->select_type, "select/linear") ||
- ((strcmp(conf->select_type, "select/alps") ||
- strcmp(conf->select_type, "select/cray")) &&
- !(conf->select_type_param & CR_OTHER_CONS_RES))))
+ && (strcmp(conf->select_type, "select/linear") &&
+ ((!strcmp(conf->select_type, "select/alps") ||
+ !strcmp(conf->select_type, "select/cray")) &&
+ (conf->select_type_param & CR_OTHER_CONS_RES))))
conf->select_type_param |= CR_CPU;
if (!s_p_get_string( &conf->slurm_user_name, "SlurmUser", hashtbl)) {
--
GitLab