EnDroid

Merge lp:~slimey/endroid/hi5-fix into lp:endroid

  1. hi5-fix
  2. Merge into trunk
Proposed by Simon C
Status: Merged
Approved by: ChrisD
Approved revision: 68
Merged at revision: 68
Proposed branch: lp:~slimey/endroid/hi5-fix
Merge into: lp:endroid
Diff against target: 11 lines (+1/-0)
1 file modified
src/endroid/plugins/hi5.py (+1/-0)
To merge this branch: bzr merge lp:~slimey/endroid/hi5-fix
Reviewer Review Type Date Requested Status
ChrisD Approve
Review via email: mp+185475@code.launchpad.net

Commit message

Fix hi5 plugin logging bug

Description of the change

Tell gpg to chill out about validating trust for the optional encryption key

To post a comment you must log in.
Revision history for this message
ChrisD (gingerchris) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/plugins/hi5.py'
2--- src/endroid/plugins/hi5.py 2013-09-10 19:25:30 +0000
3+++ src/endroid/plugins/hi5.py 2013-09-13 11:53:29 +0000
4@@ -74,6 +74,7 @@
5 def endroid_init(self):
6 if 'gpg' in self.vars:
7 self.gpg = ('/usr/bin/gpg', '--encrypt', '--armor',
8+ '--batch', '--trust-model', 'always',
9 '--keyring', self.vars['gpg'][0],
10 '--recipient', self.vars['gpg'][1])
11 else:

Subscribers

People subscribed via source and target branches