From: Michal Nowikowski <godfryd@isc.org>
Date: Tue, 5 Jan 2021 14:37:38 +0000 (+0100)
Subject: [#1512] hammer: improved handling missing vagrant
X-Git-Tag: Kea-1.9.4~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=001b8d5c0b59cf1cbaecbf769d0504a77914fa6a;p=thirdparty%2Fkea.git

[#1512] hammer: improved handling missing vagrant
---

diff --git a/hammer.py b/hammer.py
index 352a4c5322..016f9f47d8 100755
--- 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)