duplicity-team team mailing list archive

[Martin Wilck <mwilck@xxxxxxxxxx>]

Martin Wilck has proposed merging lp:~mwilck/duplicity/0.7-series into lp:duplicity/0.7-series.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~mwilck/duplicity/0.7-series/+merge/316852

Fixed the documentation of --use-agent in the man page. It was still talking about --pinentry-mode=cancel. Also, clarify that the gnupg version dependency applies if the --use-agent parameter is NOT used.

-- 
Your team duplicity-team is requested to review the proposed merge of lp:~mwilck/duplicity/0.7-series into lp:duplicity/0.7-series.

=== modified file 'bin/duplicity.1'
--- bin/duplicity.1	2017-02-07 16:09:53 +0000
+++ bin/duplicity.1	2017-02-09 13:43:43 +0000
@@ -926,18 +926,19 @@
 .I --encrypt-key
 or
 .I --sign-key
-if needed.
+if needed. If a passphrase is required,
+.B gpg-agent
+will ask for it using its
+.B pinentry
+user interface.
 .br
 .B Note:
-Contrary to previous versions of duplicity, this option will also be honored
-by GnuPG 2 and newer versions. If GnuPG 2 is in use, duplicity passes the option
-.I --pinentry-mode=cancel
-to the the gpg process unless
-.I --use-agent
-is specified on the duplicity command line. This has the effect that GnuPG 2
-uses the agent only if
-.I --use-agent
-is given, just like GnuPG 1.
+If the
+.I --use-agent
+parameter is
+.B not
+used, GnuPG shouldn't use the agent. This works with GnuPG 1.x and 2.1.x, but
+not with GnuPG 2.0.x, where using the agent can't be avoided.
 
 .TP
 .BI "--verbosity " level ", -v" level