diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1 index 7557fa74cde0c11f02df488c59184d0604c7bf97..71d9b21ac635cf02d8fde38b409d256b41577caf 100644 --- a/doc/man/man1/scontrol.1 +++ b/doc/man/man1/scontrol.1 @@ -1175,11 +1175,11 @@ Ignore currently running jobs when creating the reservation. This can be especially useful when reserving all nodes in the system for maintenance. .TP -\fIPART_NODES\fR -This flag can be used to reserve all nodes within the specified -partition. PartitionName and Nodes=ALL must be specified or -this option is ignored. -.TP +\fIPART_NODES\fR +This flag can be used to reserve all nodes within the specified +partition. PartitionName and Nodes=ALL must be specified or +this option is ignored. +.TP \fIDAILY\fR Repeat the reservation at the same time every day .TP diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in index 197e003dfbae18c1193a404e1443816d662f19bc..c6d3caeb523439456ddfade487484bbb2ea095ae 100644 --- a/slurm/slurm.h.in +++ b/slurm/slurm.h.in @@ -1692,8 +1692,8 @@ void slurm_init_update_block_msg PARAMS((update_block_msg_t *update_block_msg)); #define RESERVE_FLAG_NO_LIC_ONLY 0x0200 /* Clear reserve licenses only flag */ #define RESERVE_FLAG_STATIC 0x0400 /* Static node allocation */ #define RESERVE_FLAG_NO_STATIC 0x0800 /* Clear static node allocation */ -#define RESERVE_FLAG_PART_NODES 0x1000 /* Use Partition Nodes only */ -#define RESERVE_FLAG_NO_PART_NODES 0x2000 /* Clear Partition Nodes only */ +#define RESERVE_FLAG_PART_NODES 0x1000 /* Use Partition Nodes only */ +#define RESERVE_FLAG_NO_PART_NODES 0x2000 /* Clear Partition Nodes only */ #define RESERVE_FLAG_OVERLAP 0x4000 /* Permit to overlap others */ #define RESERVE_FLAG_SPEC_NODES 0x8000 /* Contains specific nodes */ diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c index f1641104b537afdeacf4540bae79542ed10112a6..148bf7244f2b6da1bf08aaeef042dca5b7f1e479 100644 --- a/src/common/slurm_protocol_defs.c +++ b/src/common/slurm_protocol_defs.c @@ -1392,16 +1392,16 @@ extern char *reservation_flags_string(uint16_t flags) xstrcat(flag_str, ","); xstrcat(flag_str, "NO_STATIC"); } - if (flags & RESERVE_FLAG_PART_NODES) { - if (flag_str[0]) - xstrcat(flag_str, ","); - xstrcat(flag_str, "PART_NODES"); - } - if (flags & RESERVE_FLAG_NO_PART_NODES) { - if (flag_str[0]) - xstrcat(flag_str, ","); - xstrcat(flag_str, "NO_PART_NODES"); - } + if (flags & RESERVE_FLAG_PART_NODES) { + if (flag_str[0]) + xstrcat(flag_str, ","); + xstrcat(flag_str, "PART_NODES"); + } + if (flags & RESERVE_FLAG_NO_PART_NODES) { + if (flag_str[0]) + xstrcat(flag_str, ","); + xstrcat(flag_str, "NO_PART_NODES"); + } return flag_str; } diff --git a/src/sview/popups.c b/src/sview/popups.c index a7da7d0e2e401d879264408afa606e69f6babc9c..91dfc37af5719543a0a837bf13a94e0e15a04e08 100644 --- a/src/sview/popups.c +++ b/src/sview/popups.c @@ -551,7 +551,7 @@ extern void create_create_popup(GtkAction *action, gpointer user_data) "Specify either Accounts or Users.\n\n" "Supported Flags include: Maintenance, Overlap,\n" "Ignore_Jobs, Daily and Weekly, License_Only\n" - "Part_Nodes and Static_Alloc.\n" + "Part_Nodes and Static_Alloc.\n" "All other fields are optional."); resv_msg = xmalloc(sizeof(resv_desc_msg_t)); slurm_init_resv_desc_msg(resv_msg); diff --git a/src/sview/resv_info.c b/src/sview/resv_info.c index 4d0ac8ea178cb620afbe09e4a7f30b2da631368d..59fe372ad7fbb7009eee8c4ae51215bca2ec5631 100644 --- a/src/sview/resv_info.c +++ b/src/sview/resv_info.c @@ -188,8 +188,8 @@ static void _process_each_resv(GtkTreeModel *model, GtkTreePath *path, /* * _parse_flags is used to parse the Flags= option. It handles - * daily, weekly, maint, static_nodes and part_nodes optionally - * preceded by + or -, separated by a comma but no spaces. + * daily, weekly, maint, static_nodes and part_nodes optionally + * preceded by + or -, separated by a comma but no spaces. */ static uint32_t _parse_flags(const char *flagstr) { @@ -253,13 +253,13 @@ static uint32_t _parse_flags(const char *flagstr) outflags |= RESERVE_FLAG_NO_STATIC; else outflags |= RESERVE_FLAG_STATIC; - } else if (strncasecmp(curr, "Part_Nodes", MAX(taglen,1)) - == 0) { - curr += taglen; - if (flip) - outflags |= RESERVE_FLAG_NO_PART_NODES; - else - outflags |= RESERVE_FLAG_PART_NODES; + } else if (strncasecmp(curr, "Part_Nodes", MAX(taglen,1)) + == 0) { + curr += taglen; + if (flip) + outflags |= RESERVE_FLAG_NO_PART_NODES; + else + outflags |= RESERVE_FLAG_PART_NODES; } else { char *temp = g_strdup_printf("Error parsing flags %s.", flagstr);