svn merge -r9941:9943 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

ported as necessary to v1.2.

NEWS

@@ -97,6 +97,7 @@ documents those changes that are of interest to users and admins.
    time
  - Make connect() non-blocking and poll() with timeout to avoid huge 
    waits under some conditions.
+ - Set "ENVIRONMENT=BATCH" environment variable for "srun --batch" jobs only.
 
 * Changes in SLURM 1.1.17
 =========================

src/sbatch/sbatch.c

@@ -162,6 +162,7 @@ static int fill_job_desc_from_opts(job_desc_msg_t *desc)
 		desc->time_limit = opt.time_limit;
 	desc->shared = opt.shared;
 
+	putenv("ENVIRONMENT=BATCH");
 	desc->environment = environ;
 	desc->env_size = envcount (environ);
 	desc->argv = opt.script_argv;

src/srun/allocate.c

@@ -547,6 +547,7 @@ job_desc_msg_create_from_opts (char *script)
 		 */
 		xassert (opt.batch);
 
+		putenv("ENVIRONMENT=BATCH");
 		j->environment = environ;
 		j->env_size = envcount (environ);
 		j->script = script;