diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-07-02 11:15:13 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-07-02 11:15:13 +0200 |
| commit | 88f5433d3e0e1e85c2f27f55ca3e3c166ef3075c (patch) | |
| tree | dce0dc157b8252cc607353ff42d36ab355fb469c | |
| parent | a83a2196f1359f577157abd668cd4a1f3d1ff680 (diff) | |
| download | qutebrowser-88f5433d3e0e1e85c2f27f55ca3e3c166ef3075c.tar.gz qutebrowser-88f5433d3e0e1e85c2f27f55ca3e3c166ef3075c.zip | |
Fall back on NAME if no PRETTY_NAME is given
| -rw-r--r-- | qutebrowser/utils/version.py | 6 | ||||
| -rw-r--r-- | tests/unit/utils/test_version.py | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 9b1a6e19e..437ba49a3 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -100,9 +100,9 @@ def distribution(): except (OSError, UnicodeDecodeError): return None - pretty = info.get('PRETTY_NAME', 'Unknown') - if pretty == 'Linux': # Thanks, Funtoo - pretty = info.get('NAME', pretty) + pretty = info.get('PRETTY_NAME', None) + if pretty in ['Linux', None]: # Funtoo has PRETTY_NAME=Linux + pretty = info.get('NAME', 'Unknown') if 'VERSION_ID' in info: dist_version = pkg_resources.parse_version(info['VERSION_ID']) diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index 6f3562b7d..4c95d599f 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -186,7 +186,15 @@ from qutebrowser.browser import pdfjs version.DistributionInfo( id='org.kde.Platform', parsed=version.Distribution.kde, version=pkg_resources.parse_version('5.12'), - pretty='Unknown')), + pretty='KDE')), + # No PRETTY_NAME + (""" + NAME="Tux" + ID=tux + """, + version.DistributionInfo( + id='tux', parsed=version.Distribution.unknown, + version=None, pretty='Tux')), ]) def test_distribution(tmpdir, monkeypatch, os_release, expected): os_release_file = tmpdir / 'os-release' |