lp:~mwilck/duplicity/duplicity

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~duplicity-team/duplicity/0.8-series at revision 1150

duplicity-team: Pending requested 2016-09-21

Diff: 58 lines (+27/-3)

2 files modified

bin/duplicity.1 (+9/-3)
duplicity/gpg.py (+18/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1150. By Martin Wilck on 2016-09-21

GPG: enable truly non-interactive operation with gpg2

GPG always tries to grab a passphrase from the gpg agent, even
if is run with "--batch --no-tty" (as enforced by the
meta_interactive = 0 setting of gpginterface.py).

Sometimes this behavior is not intended. I would like to be able
to run a backup job truly interactively. This would be possible,
but duplicity's check_manifests() function calls gpg to compare
the remote (encrypted) and local manifest, which, with gpg2,
will pop up the gpg agent pinentry every time I try to save backup
(with gpg1, duplicity will just give up on the verification).

I found that it's possible to force gpg2 to behave like gpg1 by
using the command line option "--pinentry-mode=cancel". My patch
applies this option if duplicity's "--use-agent" option is unset.

Now, even with gpg2, backups can be saved without any passphrase
dialog, at the cost of not being able to verify the manifests. Users
who want the verification would just need to use "--use-agent", as
with gpg1.

For restore, this change has no effect, as duplicity will ask for the
passphrase anyway if "--use-agent" is not specirfied.

1149. By Kenneth Loafman on 2016-09-16

* Fixed bug #1623342 with patch from Daniel Jakots
  - failing test on OpenBSD because tar/gtar not found

1148. By Kenneth Loafman on 2016-08-29

- Add requirements.txt
- Remove module mocks in conf.py

1147. By Kenneth Loafman on 2016-08-29

- OK, finally grokked how to mock out _librsync, but it did mean having to change librsync.py with a conditional. Would have preferred a cleaner solution.
- Fixed the remaining warnings in READTHEDOCS build, including the removal of a couple of files that were extraneous.

1146. By ken on 2016-08-24

Try autodoc_mock_imports...

1145. By ken on 2016-08-24

Try autodoc_mock_imports...

1144. By ken on 2016-08-24

Try autodoc_mock_imports...

1143. By ken on 2016-08-24

Try fully qualified module name, again.

1142. By ken on 2016-08-24

Remove fully qualified name.

1141. By ken on 2016-08-24

Resolve recursion in Mock.