From 019c1dc0bb5fc90ecb6480a0541c074a292bfe18 Mon Sep 17 00:00:00 2001
From: Jonathan Cross <jcross@gmail.com>
Date: Fri, 10 Jan 2020 19:16:24 +0100
Subject: gitian-build.py: Fixing check for docker command.

---
 contrib/gitian/gitian-build.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'contrib')

diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 64eb218bb..713b0dce5 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -36,8 +36,11 @@ def setup():
     os.chdir('..')
     make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
     if args.docker:
-        if not subprocess.call(['docker', '--help'], shell=False, stdout=subprocess.DEVNULL):
-            print("Please install docker first manually")
+        try:
+            subprocess.check_output(['docker', '--help'])
+        except:
+            print("ERROR: Could not find 'docker' command. Ensure this is in your PATH.")
+            sys.exit(1)
         make_image_prog += ['--docker']
     elif not args.kvm:
         make_image_prog += ['--lxc']
-- 
cgit v1.2.3