mirror
/
vorta
mirror of https://github.com/borgbase/vorta
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve kwallet verification. By @samuel-w (#889)

This commit is contained in:
samuel-w 2021-02-24 07:25:17 -06:00 committed by GitHub
parent 8da81e73b6
commit 46c3eee9a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vorta/keyring/kwallet.py
View File

@ -20,7 +20,7 @@ class VortaKWallet5Keyring(VortaKeyring):
self.object_path,
self.interface_name,
QtDBus.QDBusConnection.sessionBus())
if not (self.iface.isValid() and self.get_result("isEnabled")):
if not (self.iface.isValid() and self.get_result("isEnabled") is True):
raise KWalletNotAvailableException
def set_password(self, service, repo_url, password):
@ -49,7 +49,10 @@ class VortaKWallet5Keyring(VortaKeyring):
wId = QVariant(0)
wId.convert(4)
output = self.get_result("open", args=[wallet_name, wId, 'vorta-repo'])
self.handle = int(output)
try:
self.handle = int(output)
except ValueError: # For when kwallet is disabled or dbus otherwise broken
return -2
class KWalletNotAvailableException(Exception):