From aeeadc29300927c8d4704a0e5b593a3d2bb047d7 Mon Sep 17 00:00:00 2001 From: Nicolas Joly <njoly@pasteur.fr> Date: Tue, 14 Oct 2014 10:19:41 -0700 Subject: [PATCH] Fix for bad logic in commit 686cd1177c8147 --- src/slurmdbd/read_config.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/slurmdbd/read_config.c b/src/slurmdbd/read_config.c index f5507f896e8..fd688ce9d6a 100644 --- a/src/slurmdbd/read_config.c +++ b/src/slurmdbd/read_config.c @@ -410,20 +410,15 @@ extern int read_slurmdbd_conf(void) "TrackSlurmctldDown", tbl)) slurmdbd_conf->track_ctld = false; - if (a_events && - SLURMDB_PURGE_ARCHIVE_SET(slurmdbd_conf->purge_event)) + if (a_events && slurmdbd_conf->purge_event) slurmdbd_conf->purge_event |= SLURMDB_PURGE_ARCHIVE; - if (a_jobs && - SLURMDB_PURGE_ARCHIVE_SET(slurmdbd_conf->purge_job)) + if (a_jobs && slurmdbd_conf->purge_job) slurmdbd_conf->purge_job |= SLURMDB_PURGE_ARCHIVE; - if (a_resv && - SLURMDB_PURGE_ARCHIVE_SET(slurmdbd_conf->purge_resv)) + if (a_resv && slurmdbd_conf->purge_resv) slurmdbd_conf->purge_resv |= SLURMDB_PURGE_ARCHIVE; - if (a_steps && - SLURMDB_PURGE_ARCHIVE_SET(slurmdbd_conf->purge_step)) + if (a_steps && slurmdbd_conf->purge_step) slurmdbd_conf->purge_step |= SLURMDB_PURGE_ARCHIVE; - if (a_suspend && - SLURMDB_PURGE_ARCHIVE_SET(slurmdbd_conf->purge_suspend)) + if (a_suspend && slurmdbd_conf->purge_suspend) slurmdbd_conf->purge_suspend |= SLURMDB_PURGE_ARCHIVE; s_p_hashtbl_destroy(tbl); -- GitLab