From 6901550065523e575d7d1af609add653b5d2fb91 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 28 Jul 2015 12:41:24 -0700 Subject: [PATCH] Fix some installer issues --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a6e8eb73..49d0105b 100644 --- a/setup.py +++ b/setup.py @@ -108,15 +108,15 @@ def check_external_program( result = check_output( [program] + version_check_args, universal_newlines=True, stderr=STDOUT) - except CalledProcessError: + except (CalledProcessError, FileNotFoundError): error_missing_program(program, package, optional) if not optional: sys.exit(1) try: version = version_scrape_regex.search(result).group(1) - except AttributeError: - error_unknown_version(program, package, optional, minimum_version) + except (AttributeError, CalledProcessError): + error_unknown_version(program, package, optional) if not optional: sys.exit(1)