From 40b949364edd803d849ecd8eca477b07e869921e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 19 Jun 2017 13:37:00 +0200 Subject: [PATCH] Fix qute://backend-warning issues We now set a title correctly, and don't crash if we find a Debian/Ubuntu without version. --- qutebrowser/browser/qutescheme.py | 3 ++- qutebrowser/html/backend-warning.html | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index b0c555e4e..652c58726 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -440,5 +440,6 @@ def qute_backend_warning(_url): html = jinja.render('backend-warning.html', distribution=version.distribution(), Distribution=version.Distribution, - version=pkg_resources.parse_version) + version=pkg_resources.parse_version, + title="Legacy backend warning") return 'text/html', html diff --git a/qutebrowser/html/backend-warning.html b/qutebrowser/html/backend-warning.html index b04793a35..bf35aca93 100644 --- a/qutebrowser/html/backend-warning.html +++ b/qutebrowser/html/backend-warning.html @@ -39,9 +39,15 @@ the qute://settings page or caret browsing). If you know more, please open an issue! {%- endmacro %} +{% macro unknown_system() -%} + There's no information available for your system. {{ please_open_issue() }} +{%- endmacro %} +

{% if distribution.parsed == Distribution.ubuntu %} - {% if distribution.version >= version('17.04') %} + {% if distribution.version == none %} + {{ unknown_system() }} + {% elif distribution.version >= version('17.04') %} {{ install_webengine('python3-pyqt5.qtwebengine') }} {% elif distribution.version >= version('16.04') %} QtWebEngine is only available in Ubuntu's repositories since 17.04, but you can install qutebrowser via tox with tox -e mkvenv-pypi to use the new backend. @@ -49,7 +55,9 @@ the qute://settings page or caret browsing). Unfortunately, no easy way is known to install QtWebEngine on Ubuntu < 16.04. {{ please_open_issue() }} {% endif %} {% elif distribution.parsed == Distribution.debian %} - {% if distribution.version >= version('9') %} + {% if distribution.version == none %} + {{ unknown_system() }} + {% elif distribution.version >= version('9') %} {{ install_webengine('python3-pyqt5.qtwebengine') }} {% else %} Unfortunately, no easy way is known to install QtWebEngine on Debian < 9. {{ please_open_issue() }} @@ -63,7 +71,7 @@ the qute://settings page or caret browsing). {% elif distribution.parsed == Distribution.opensuse %} {{ install_webengine('libqt5-qtwebengine') }} {% else %} - There's no information available for your system. {{ please_open_issue() }} + {{ unknown_system() }} {% endif %}

@@ -72,7 +80,7 @@ the qute://settings page or caret browsing). This is a drop-in replacement for legacy QtWebKit.

-{% if distribution.parsed == Distribution.debian and distribution.version >= version('9') %} +{% if distribution.parsed == Distribution.debian and distribution.version != none and distribution.version >= version('9') %} There are unofficial QtWebKit-NG packages available. {% elif distribution.parsed in [Distribution.ubuntu, Distribution.debian] %} No easy way is known to install QtWebKit-NG on your system. @@ -83,7 +91,7 @@ the qute://settings page or caret browsing). {% elif distribution.parsed == Distribution.gentoo %} There's an unofficial ebuild available. {% else %} - There's no information available for your system. {{ please_open_issue() }} + {{ unknown_system() }} {% endif %}