[OSSTEST PATCH 6/6] sg-run-job: Do blocked check globally, in run-job

[Ian Jackson <ian.jackson@eu.citrix.com>]

Only run-job can fully abandon the whole job.  With the previous
arrangements (in bc63a901), a blocked build job would go on to try to
run ts-logs-capture and become broken (rather than blocked).

The downside of this is that it is not possible in the future to
introduce a kind of job which can selectively carry on if some of its
dependencies fail.  This notion is IMO an acceptable casualty.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 sg-run-job |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sg-run-job b/sg-run-job
index c1dfa86..e903869 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -39,9 +39,10 @@ proc run-job {job} {
         set need_build_host 0
     }
 
+    catching-otherwise blocked            check-not-blocked
+    if {!$ok} return
+
     if {[llength $need_xen_hosts]} {
-               catching-otherwise blocked   check-not-blocked
-	if {!$ok} return
         eval run-ts broken  =             ts-hosts-allocate + $need_xen_hosts
     }
 
@@ -340,9 +341,7 @@ proc run-job/build-rumpuserxen {} {
 }
 
 proc prepare-build-host {} {
-    global jobinfo ok
-    catching-otherwise blocked check-not-blocked
-    if {!$ok} return
+    global jobinfo
     run-ts broken = ts-hosts-allocate + host
     run-ts broken host-install(*) ts-host-install-twice
     run-ts . host-build-prep ts-xen-build-prep
-- 
1.7.10.4