diff options
author | Florian Bruhin <me@the-compiler.org> | 2021-01-28 16:26:42 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2021-01-28 16:26:51 +0100 |
commit | a20fadfd199405db4fcfc800409b73714f0f18b9 (patch) | |
tree | a800c1e18b9cf6d043a0b86d6526e4c463bd9c1a | |
parent | 836047ab539be27103ad778adbd995235e86a402 (diff) | |
download | qutebrowser-a20fadfd199405db4fcfc800409b73714f0f18b9.tar.gz qutebrowser-a20fadfd199405db4fcfc800409b73714f0f18b9.zip |
Split envvar warning into function
(cherry picked from commit a5c53a307a37fef6f91fe0689bc1620736a4a92c)
-rw-r--r-- | qutebrowser/config/qtargs.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/qutebrowser/config/qtargs.py b/qutebrowser/config/qtargs.py index 415a76f25..74934290d 100644 --- a/qutebrowser/config/qtargs.py +++ b/qutebrowser/config/qtargs.py @@ -256,6 +256,18 @@ def _qtwebengine_settings_args() -> Iterator[str]: yield arg +def _warn_qtwe_flags_envvar() -> None: + """Warn about the QTWEBENGINE_CHROMIUM_FLAGS envvar if it is set.""" + qtwe_flags_var = 'QTWEBENGINE_CHROMIUM_FLAGS' + qtwe_flags = os.environ.get(qtwe_flags_var) + if qtwe_flags is not None: + log.init.warning( + f"You have {qtwe_flags_var}={qtwe_flags!r} set in your environment. " + "This is currently unsupported and interferes with qutebrowser's own " + "flag handling (including workarounds for certain crashes). " + "Consider using the qt.args qutebrowser setting instead.") + + def init_envvars() -> None: """Initialize environment variables which need to be set early.""" if objects.backend == usertypes.Backend.QtWebEngine: @@ -266,15 +278,7 @@ def init_envvars() -> None: os.environ['QT_QUICK_BACKEND'] = 'software' elif software_rendering == 'chromium': os.environ['QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND'] = '1' - - qtwe_flags_var = 'QTWEBENGINE_CHROMIUM_FLAGS' - qtwe_flags = os.environ.get(qtwe_flags_var) - if qtwe_flags is not None: - log.init.warning( - f"You have {qtwe_flags_var}={qtwe_flags!r} set in your environment. " - "This is currently unsupported and interferes with qutebrowser's own " - "flag handling (including workarounds for certain crashes). " - "Consider using the qt.args qutebrowser setting instead.") + _warn_qtwe_flags_envvar() else: assert objects.backend == usertypes.Backend.QtWebKit, objects.backend |