Skip to content

Commit 63a54aa

Browse files
authored
Merge pull request SensorsIot#220 from jamesmyatt/fixes-001
Fixes for missing optional dependencies
2 parents 99c9cf9 + a9c40ff commit 63a54aa

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

scripts/menu_main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#!/usr/bin/env python3
2-
1+
#!/usr/bin/python3
32
from blessed import Terminal
43
import sys
54
import subprocess
@@ -299,6 +298,7 @@ def checkDockerVersion():
299298
currentDockerVersion = currentDockerVersion.decode("utf-8").rstrip().replace('"', '')
300299
except Exception as err:
301300
print("Error attempting to run docker command:", err)
301+
currentDockerVersion = ""
302302

303303
return checkVersion(requiredDockerVersion, currentDockerVersion)
304304

scripts/python_deps_check.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/python3
12
import sys
23

34
if sys.argv[1] == "--pyyaml-version":
@@ -7,7 +8,7 @@
78
sys.exit(0)
89
except SystemExit:
910
sys.exit(0)
10-
except:
11+
except Exception:
1112
print("could not get pyyaml version")
1213
sys.exit(3)
1314

@@ -18,7 +19,7 @@
1819
sys.exit(0)
1920
except SystemExit:
2021
sys.exit(0)
21-
except:
22+
except Exception:
2223
print("could not get ruamel.yaml version")
2324
sys.exit(3)
2425

@@ -29,6 +30,6 @@
2930
sys.exit(0)
3031
except SystemExit:
3132
sys.exit(0)
32-
except:
33+
except Exception:
3334
print("could not get blessed version")
3435
sys.exit(3)

0 commit comments

Comments
 (0)