GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-07 21:27:14 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix browse add-ons command failing to load on linux

Browse source
This commit is contained in:
Damien Elmes 2017-06-27 12:04:42 +10:00
parent 1fe86e1bde
commit 2b8987f654
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aqt/utils.py
View file

@ -7,6 +7,14 @@ import re, os, sys, urllib.request, urllib.parse, urllib.error, subprocess
import aqt import aqt
from anki.sound import stripSounds from anki.sound import stripSounds
from anki.utils import isWin, isMac, invalidFilename from anki.utils import isWin, isMac, invalidFilename
from contextlib import contextmanager
@contextmanager
def noBundledLibs():
oldlpath = os.environ.pop("LD_LIBRARY_PATH", None)
yield
if oldlpath is not None:
os.environ["LD_LIBRARY_PATH"] = oldlpath
def openHelp(section): def openHelp(section):
link = aqt.appHelpSite link = aqt.appHelpSite
@ -16,7 +24,8 @@ def openHelp(section):
def openLink(link): def openLink(link):
tooltip(_("Loading..."), period=1000) tooltip(_("Loading..."), period=1000)
QDesktopServices.openUrl(QUrl(link)) with noBundledLibs():
QDesktopServices.openUrl(QUrl(link))
def showWarning(text, parent=None, help="", title="Anki"): def showWarning(text, parent=None, help="", title="Anki"):
"Show a small warning with an OK button." "Show a small warning with an OK button."
@ -351,10 +360,8 @@ def openFolder(path):
if isWin: if isWin:
subprocess.Popen(["explorer", "file://"+path]) subprocess.Popen(["explorer", "file://"+path])
else: else:
oldlpath = os.environ.pop("LD_LIBRARY_PATH", None) with noBundledLibs():
QDesktopServices.openUrl(QUrl("file://" + path)) QDesktopServices.openUrl(QUrl("file://" + path))
if oldlpath:
os.environ["LD_LIBRARY_PATH"] = oldlpath
def shortcut(key): def shortcut(key):
if isMac: if isMac: