Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1950206 [Calibre missing private copy of kdialog on Fedora 35](https://bugs.launchpad.net/calibre/+bug/1950206)

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-09 07:23:52 +05:30
parent 4d4f55a95d
commit 18dcc8734c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/linux_file_dialogs.py
View File

@ -122,9 +122,11 @@ def run(cmd):
def kdialog_supports_desktopfile(): def kdialog_supports_desktopfile():
ans = getattr(kdialog_supports_desktopfile, 'ans', None) ans = getattr(kdialog_supports_desktopfile, 'ans', None)
if ans is None: if ans is None:
from calibre.gui2 import sanitize_env_vars
try: try:
raw = subprocess.check_output(['kdialog', '--help']) with sanitize_env_vars():
except OSError: raw = subprocess.check_output(['kdialog', '--help'])
except (subprocess.CalledProcessError, FileNotFoundError, OSError):
raw = b'--desktopfile' raw = b'--desktopfile'
ans = kdialog_supports_desktopfile.ans = b'--desktopfile' in raw ans = kdialog_supports_desktopfile.ans = b'--desktopfile' in raw
return ans return ans