Duplicity

Merge lp:~mterry/duplicity/use-gpg-options-0.6 into lp:duplicity/0.6

  1. use-gpg-options-0.6
  2. Merge into 0.6-series
Proposed by Michael Terry
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mterry/duplicity/use-gpg-options-0.6
Merge into: lp:duplicity/0.6
Diff against target: 24 lines (+2/-5)
1 file modified
duplicity/gpg.py (+2/-5)
To merge this branch: bzr merge lp:~mterry/duplicity/use-gpg-options-0.6
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+20504@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/gpg.py'
2--- duplicity/gpg.py 2009-08-12 19:05:52 +0000
3+++ duplicity/gpg.py 2010-03-03 00:25:22 +0000
4@@ -38,9 +38,6 @@
5
6 blocksize = 256 * 1024
7
8-# user options appended by --gpg-options
9-gpg_options = ""
10-
11
12 class GPGError(Exception):
13 """
14@@ -105,8 +102,8 @@
15 gnupg.options.extra_args.append('--no-secmem-warning')
16 if globals.use_agent:
17 gnupg.options.extra_args.append('--use-agent')
18- if gpg_options:
19- for opt in gpg_options.split():
20+ if globals.gpg_options:
21+ for opt in globals.gpg_options.split():
22 gnupg.options.extra_args.append(opt)
23
24 if profile.sign_key:

Subscribers

People subscribed via source and target branches

to all changes: