TRQ-1653. Job arrays weren't being allowed to depend on regular jobs.…

… This change was made due to my confusion and is a problem for customers, so now it is reverted.
adaptivecomputing · Mar 29, 2013 · 5ced418 · 5ced418
1 parent f5cd910
commit 5ced418
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 c - crash     b - bug fix    e - enhancement    f - new feature  n - note
 
 4.2.3
+  b - TRQ-1653. Arrays depending on non-array jobs was broken. Fix this.
 
 4.2.2
   b - Make job_starter work for parallel jobs as well as serial. (TRQ-1577 - thanks

diff --git a/src/server/req_register.c b/src/server/req_register.c
@@ -904,16 +904,6 @@ int req_registerarray(
 
   type = preq->rq_ind.rq_register.rq_dependtype;
 
-  if (type < JOB_DEPEND_TYPE_AFTERSTARTARRAY)
-    {
-    unlock_ai_mutex(pa, __func__, "1", LOGLEVEL);
-    rc = PBSE_IVALREQ;
-    req_reject(rc,0,preq,NULL,
-      "Arrays may only be given array dependencies");
-
-    return(rc);
-    }
-
   /* register the dependency on the array */
 
   switch (preq->rq_ind.rq_register.rq_op)