Honor PASSWORD_STORE_DIR environment variable

This commit is contained in:
Jonathan Lestrelin 2017-03-14 15:59:07 +01:00
parent 7a9c9ff23d
commit 3518e05689

View File

@ -26,7 +26,7 @@
# Author: Luke Macken <lmacken@redhat.com> # Author: Luke Macken <lmacken@redhat.com>
from subprocess import call from subprocess import call
from os import walk from os import walk, getenv
from os.path import expanduser from os.path import expanduser
import re import re
@ -62,7 +62,8 @@ class SearchPassService(dbus.service.Object):
self.session_bus = dbus.SessionBus() self.session_bus = dbus.SessionBus()
bus_name = dbus.service.BusName(self.bus_name, bus=self.session_bus) bus_name = dbus.service.BusName(self.bus_name, bus=self.session_bus)
dbus.service.Object.__init__(self, bus_name, self._object_path) dbus.service.Object.__init__(self, bus_name, self._object_path)
self.password_store = expanduser('~/.password-store') self.password_store = getenv('PASSWORD_STORE_DIR') or \
expanduser('~/.password-store')
@dbus.service.method(in_signature='sasu', **sbn) @dbus.service.method(in_signature='sasu', **sbn)
def ActivateResult(self, id, terms, timestamp): def ActivateResult(self, id, terms, timestamp):
@ -98,8 +99,8 @@ class SearchPassService(dbus.service.Object):
for file in files: for file in files:
file_path = '{0}/{1}'.format(dir_path, file) file_path = '{0}/{1}'.format(dir_path, file)
if re.match(r'.*{0}.*\.gpg$'.format(name), if re.match(r'.*{0}.*\.gpg$'.format(name),
file_path, file_path,
re.IGNORECASE): re.IGNORECASE):
names.append(file_path[:-4]) names.append(file_path[:-4])
return names return names