Merge pull request #1326 from g1itch/exceptions
Additional fix for #1316
This commit is contained in:
commit
40a14748be
|
@ -137,6 +137,8 @@ if prereqs:
|
||||||
OPSYS = detectOS()
|
OPSYS = detectOS()
|
||||||
CMD = PACKAGE_MANAGER[OPSYS] if OPSYS in PACKAGE_MANAGER else 'UNKNOWN_INSTALLER'
|
CMD = PACKAGE_MANAGER[OPSYS] if OPSYS in PACKAGE_MANAGER else 'UNKNOWN_INSTALLER'
|
||||||
for lhs, rhs in EXTRAS_REQUIRE.items():
|
for lhs, rhs in EXTRAS_REQUIRE.items():
|
||||||
|
if OPSYS is None:
|
||||||
|
break
|
||||||
if rhs and any([
|
if rhs and any([
|
||||||
EXTRAS_REQUIRE_DEPS[x][OPSYS]
|
EXTRAS_REQUIRE_DEPS[x][OPSYS]
|
||||||
for x in rhs
|
for x in rhs
|
||||||
|
|
|
@ -29,6 +29,7 @@ logger.addHandler(handler)
|
||||||
logger.setLevel(logging.ERROR)
|
logger.setLevel(logging.ERROR)
|
||||||
|
|
||||||
OS_RELEASE = {
|
OS_RELEASE = {
|
||||||
|
"Debian GNU/Linux".lower(): "Debian",
|
||||||
"fedora": "Fedora",
|
"fedora": "Fedora",
|
||||||
"opensuse": "openSUSE",
|
"opensuse": "openSUSE",
|
||||||
"ubuntu": "Ubuntu",
|
"ubuntu": "Ubuntu",
|
||||||
|
|
Reference in New Issue
Block a user