diff options
Diffstat (limited to 'qutebrowser')
-rw-r--r-- | qutebrowser/misc/elf.py | 2 | ||||
-rw-r--r-- | qutebrowser/utils/standarddir.py | 2 | ||||
-rw-r--r-- | qutebrowser/utils/utils.py | 2 | ||||
-rw-r--r-- | qutebrowser/utils/version.py | 8 |
4 files changed, 9 insertions, 5 deletions
diff --git a/qutebrowser/misc/elf.py b/qutebrowser/misc/elf.py index 6d35eecb4..18cb9634c 100644 --- a/qutebrowser/misc/elf.py +++ b/qutebrowser/misc/elf.py @@ -310,7 +310,7 @@ def _parse_from_file(f: IO[bytes]) -> Versions: def parse_webenginecore() -> Optional[Versions]: """Parse the QtWebEngineCore library file.""" - if version.is_sandboxed(): + if version.is_flatpak(): # Flatpak has Qt in /usr/lib/x86_64-linux-gnu, but QtWebEngine in /app/lib. library_path = pathlib.Path("/app/lib") else: diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py index 447515ecd..d62f0ffdb 100644 --- a/qutebrowser/utils/standarddir.py +++ b/qutebrowser/utils/standarddir.py @@ -233,7 +233,7 @@ def _init_runtime(args: Optional[argparse.Namespace]) -> None: # maximum length of 104 chars), so we don't add the username here... from qutebrowser.utils import version - if version.is_sandboxed(): + if version.is_flatpak(): *parts, app_name = os.path.split(path) assert app_name == APPNAME, app_name path = os.path.join(*parts, 'app', os.environ['FLATPAK_ID']) diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 03a3c7842..780ac3184 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -607,7 +607,7 @@ def open_file(filename: str, cmdline: str = None) -> None: # if we want to use the default override = config.val.downloads.open_dispatcher - if version.is_sandboxed(): + if version.is_flatpak(): if cmdline: message.error("Cannot spawn download dispatcher from sandbox") return diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index ffb50e054..b9ca21f6d 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -189,8 +189,12 @@ def distribution() -> Optional[DistributionInfo]: parsed=parsed, version=dist_version, pretty=pretty, id=dist_id) -def is_sandboxed() -> bool: - """Whether the environment has restricted access to the host system.""" +def is_flatpak() -> bool: + """Whether qutebrowser is running via Flatpak. + + If packaged via Flatpak, the environment is has restricted access to the host + system. + """ current_distro = distribution() if current_distro is None: return False |