Merge pull request gcgarner#220 from jamesmyatt/fixes-001

Fixes for missing optional dependencies
samkomo · Jan 24, 2021 · 63a54aa · 63a54aa
2 parents 99c9cf9 + a9c40ff
commit 63a54aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/scripts/menu_main.py b/scripts/menu_main.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
-
+#!/usr/bin/python3
 from blessed import Terminal
 import sys
 import subprocess
@@ -299,6 +298,7 @@ def checkDockerVersion():
     currentDockerVersion = currentDockerVersion.decode("utf-8").rstrip().replace('"', '')
   except Exception as err:
     print("Error attempting to run docker command:", err)
+    currentDockerVersion = ""
 
   return checkVersion(requiredDockerVersion, currentDockerVersion)
 

diff --git a/scripts/python_deps_check.py b/scripts/python_deps_check.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
 import sys
 
 if sys.argv[1] == "--pyyaml-version":
@@ -7,7 +8,7 @@
     sys.exit(0)
   except SystemExit:
     sys.exit(0)
-  except:
+  except Exception:
     print("could not get pyyaml version")
     sys.exit(3)
 
@@ -18,7 +19,7 @@
     sys.exit(0)
   except SystemExit:
     sys.exit(0)
-  except:
+  except Exception:
     print("could not get ruamel.yaml version")
     sys.exit(3)
 
@@ -29,6 +30,6 @@
     sys.exit(0)
   except SystemExit:
     sys.exit(0)
-  except:
+  except Exception:
     print("could not get blessed version")
     sys.exit(3)