[OSSTEST,46/82] shared/reuse: Use @ for ts-xen-build-prep

Commit Message

Ian Jackson Oct. 7, 2020, 5:59 p.m. UTC

From: Ian Jackson <[e-mail]>

Pass @ from sg-run-job.  This is the only call site for
ts-xen-build-prep, so it can lose the open-coded test for SharedReady.

Signed-off-by: Ian Jackson <[e-mail]>
---
 sg-run-job        | 2 +-
 ts-xen-build-prep | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/sg-run-job b/sg-run-job
index 067b28db..d46a3a62 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -753,7 +753,7 @@  proc allocate-build-host {ostype} {
 proc prepare-build-host-linux {} {
     global jobinfo
     run-ts broken host-install(*) ts-host-install-twice + --build
-    run-ts . host-build-prep ts-xen-build-prep
+    run-ts . host-build-prep ts-xen-build-prep + @host
 }
 
 proc prepare-build-host-freebsd {} {
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index dabb9921..092bbffe 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -28,7 +28,6 @@  tsreadconfig();
 our ($whhost) = @ARGV;
 $whhost ||= 'host';
 our $ho= selecthost($whhost);
-exit 0 if $ho->{SharedReady};
 
 our ($vg,$lv);