Rorder parsing native specification: DRMAA attr after DRMAA conf

natefoo · Dec 2, 2013 · 32d4f9c · 32d4f9c
1 parent f74288a
commit 32d4f9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/slurm_drmaa/job.c b/slurm_drmaa/job.c
@@ -634,14 +634,7 @@ slurmdrmaa_job_create(
 	}
 	END_TRY			
 
-	/* native specification */
-	value = jt->get_attr( jt, DRMAA_NATIVE_SPECIFICATION );
-	if( value )
-	{
-		fsd_log_debug(("# Native specification: %s\n", value));
-		slurmdrmaa_parse_native(job_desc, value);
-	}
-
+
 	/* job category */
 	value = jt->get_attr( jt, DRMAA_JOB_CATEGORY );
 	if( value )
@@ -671,6 +664,14 @@ slurmdrmaa_job_create(
 						);
 	 	}
  	}
+
+	/* native specification */
+	value = jt->get_attr( jt, DRMAA_NATIVE_SPECIFICATION );
+	if( value )
+	{
+		fsd_log_debug(("# Native specification: %s\n", value));
+		slurmdrmaa_parse_native(job_desc, value);
+	}
 
 }		
 

diff --git a/slurm_drmaa/util.c b/slurm_drmaa/util.c
@@ -352,7 +352,6 @@ slurmdrmaa_add_attribute(job_desc_msg_t *job_desc, unsigned attr, const char *va
             		job_desc->job_min_tmp_disk = fsd_atoi(value);
             		#endif
 			break;
-
 		default:
 			fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,"Invalid attribute");
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
                 		job_desc->job_min_tmp_disk = fsd_atoi(value);
                 		#endif
     			break;
     		default:
     			fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,"Invalid attribute");
     	}
@@ Expand Down @@