Additional fix for #1316 #1326

Merged
g1itch merged 2 commits from exceptions into v0.6 2018-07-30 10:43:29 +02:00
2 changed files with 3 additions and 0 deletions

View File

@ -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

View File

@ -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",