]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#1512] hammer: improved handling missing vagrant
authorMichal Nowikowski <godfryd@isc.org>
Tue, 5 Jan 2021 14:37:38 +0000 (15:37 +0100)
committerMichal Nowikowski <godfryd@isc.org>
Tue, 5 Jan 2021 14:37:38 +0000 (15:37 +0100)
hammer.py

index 352a4c532203af8f41c91b1a629a24b9c092cf4c..016f9f47d8475462a7cda547c330f1df1d35004f 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -2401,14 +2401,9 @@ def build_cmd(args):
 
 
 def _check_deps_presence():
-    try:
-        ret = execute('vagrant -v', super_quiet=True)
-        if ret != 0:
-            print('Missing vagrant. Please install it from https://www.vagrantup.com/')
-            sys.exit(1)
-    except ExecutionError as e:
-        print('Unable to run vagrant. Please install it from https://www.vagrantup.com/')
-        print('Encountered error: %s' % e)
+    ret = execute('vagrant -v', super_quiet=True, raise_error=False)
+    if ret != 0:
+        print('Missing vagrant. Please install it from https://www.vagrantup.com/')
         sys.exit(1)