svn merge -r20971:20973 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

src/srun/allocate.c

@@ -239,7 +239,6 @@ static int _wait_bluegene_block_ready(resource_allocation_response_msg_t *alloc)
 	int max_delay = BG_FREE_PREVIOUS_BLOCK + BG_MIN_BLOCK_BOOT +
 		(BG_INCR_BLOCK_BOOT * alloc->node_cnt);
 
-	pending_job_id = alloc->job_id;
 	select_g_select_jobinfo_get(alloc->select_jobinfo,
 				    SELECT_JOBDATA_BLOCK_ID,
 				    &block_id);
@@ -279,7 +278,6 @@ static int _wait_bluegene_block_ready(resource_allocation_response_msg_t *alloc)
 		is_ready = 0;
 
 	xfree(block_id);
-	pending_job_id = 0;
 
 	return is_ready;
 }
@@ -464,6 +462,7 @@ allocate_nodes(void)
 		/*
 		 * Allocation granted!
 		 */
+		pending_job_id = resp->job_id;
 #ifdef HAVE_BG
 		if (!_wait_bluegene_block_ready(resp)) {
 			if(!destroy_job)