Merge branch 'stable-2.15'

* stable-2.15:
  Revert "Reduce chance of deadlock in account cache"
  release-announcement: support older version of python-gnupg
  Fix event targeting in menu-editor
  Consolidate button styles and update disabled
  Move Save button to left side and mark as tertiary
  Update buttons on overlays
  Reduce chance of deadlock in account cache

Change-Id: Ica60c233169278009a680502722b68db4ab26117
This commit is contained in:
David Pursehouse
2018-02-28 15:57:58 +09:00

View File

@@ -142,7 +142,10 @@ def _main():
if not os.path.isdir(gpghome):
print("Skipping signing due to missing gnupg home folder")
else:
gpg = GPG(homedir=gpghome)
try:
gpg = GPG(homedir=gpghome)
except TypeError:
gpg = GPG(gnupghome=gpghome)
signed = gpg.sign(output)
filename = filename + ".asc"
with open(filename, "w") as f: