Fix a bug in the processing of srun's --exclusive option for a job step.

NEWS

@@ -6,6 +6,7 @@ documents those changes that are of interest to users and admins.
  -- Add support for configurable number of jobs to share resources using the 
     partition Shared parameter in slurm.conf (e.g. "Shared=FORCE:3" for two 
     jobs to share the resources). From Chris Holmes, HP.
+ -- Fix a bug in the processing of srun's --exclusive option for a job step.
 
 * Changes in SLURM 1.3.0-pre5
 =============================

src/srun/opt.c

@@ -1822,13 +1822,6 @@ static bool _opt_verify(void)
 			opt.nodes_set = true;
 		}
 	}
-	if (opt.exclusive && opt.nodes_set) {
-		verbose("ignoring node count set by --nodes or SLURM_NNODES");
-		verbose("  it is incompatible with --exclusive");
-		opt.nodes_set = false;
-		opt.min_nodes = 1;
-		opt.max_nodes = 0;
-	}
 	if ((opt.nodes_set || opt.extra_set) && !opt.nprocs_set) {
 		/* 1 proc / node default */
 		opt.nprocs = opt.min_nodes;

src/srun/srun.c

@@ -835,6 +835,13 @@ static void _pty_restore(void)
 /* opt.exclusive is set, disable user task layout controls */
 static void _step_opt_exclusive(void)
 {
+	if (opt.nodes_set) {
+		verbose("ignoring node count set by --nodes or SLURM_NNODES");
+		verbose("  it is incompatible with --exclusive");
+		opt.nodes_set = false;
+		opt.min_nodes = 1;
+		opt.max_nodes = 0;
+	}
 	if (!opt.nprocs_set)
 		fatal("--nprocs must be set with --exclusive");
 	if (opt.relative_set)