Merge remote-tracking branch 'origin/slurm-17.02' into slurm-17.11

NEWS

@@ -439,6 +439,7 @@ documents those changes that are of interest to users and administrators.
  -- Fix potential of slurmstepd segfaulting when the extern step fails to start.
  -- Allow nodes state to be updated between FAIL and DRAIN.
  -- Avoid registering a job'd credential multiple times.
+ -- Fix sbatch --wait to stop waiting after job is gone from memory.
 
 * Changes in Slurm 17.02.9
 ==========================

src/sbatch/sbatch.c

@@ -390,7 +390,12 @@ static int _job_wait(uint32_t job_id)
 				}
 			}
 			slurm_free_job_info_msg(resp);
-		} else if (rc == ESLURM_INVALID_JOB_ID) {
+		} else if ((rc == ESLURM_INVALID_JOB_ID) ||
+			   (errno == ESLURM_INVALID_JOB_ID)) {
+			/*
+			 * 17.11 returns the error code in rc (and errno). The
+			 * check for errno isn't needed in 17.11.
+			 */
 			error("Job %u no longer found and exit code not found",
 			      job_id);
 		} else {