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:24 +0000
4
@@ -38,9 +38,6 @@
5
38
38
6
39
blocksize = 256 * 1024
39
blocksize = 256 * 1024
7
40
40
8
41
# user options appended by --gpg-options
9
42
gpg_options = ""
10
43
11
44
41
12
45
class GPGError(Exception):
42
class GPGError(Exception):
13
46
    """
43
    """
14
@@ -105,8 +102,8 @@
15
105
        gnupg.options.extra_args.append('--no-secmem-warning')
102
        gnupg.options.extra_args.append('--no-secmem-warning')
16
106
        if globals.use_agent:
103
        if globals.use_agent:
17
107
            gnupg.options.extra_args.append('--use-agent')
104
            gnupg.options.extra_args.append('--use-agent')
20
108
        if gpg_options:
105
        if globals.gpg_options:
21
109
            for opt in gpg_options.split():
106
            for opt in globals.gpg_options.split():
22
110
                gnupg.options.extra_args.append(opt)
107
                gnupg.options.extra_args.append(opt)
23
111
108
24
112
        if profile.sign_key:
109
        if profile.sign_key:
Status:	Merged
Merged at revision:	not available
Proposed branch:	lp:~mterry/duplicity/use-gpg-options-0.7
Merge into:	lp:~duplicity-team/duplicity/0.7-series
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.7
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
duplicity-team		2010-03-03	Pending
Review via email: mp+20503@code.launchpad.net