citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #1326 from g1itch/exceptions

Browse Source 
Additional fix for #1316
This commit is contained in:
Dmitri Bogomolov 2018-07-30 11:43:28 +03:00 committed by GitHub
commit 40a14748be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checkdeps.py
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

1
src/depends.py
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",