[Pkg-gnupg-commit] [gnupg2] 47/185: gpg: Improve some output of gpgcompose.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Aug 7 11:55:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit cb0484e0762a1ce05d00d949f4b70162e2f7b82c
Author: Neal H. Walfield <neal at g10code.com>
Date: Sun Jun 11 14:07:02 2017 +0200
gpg: Improve some output of gpgcompose.
---
g10/gpgcompose.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c
index 49bb8af..98c04f2 100644
--- a/g10/gpgcompose.c
+++ b/g10/gpgcompose.c
@@ -512,7 +512,8 @@ static struct option major_options[] = {
{ "--encrypted-mdc", encrypted,
"Create a symmetrically encrypted and integrity protected data packet." },
{ "--encrypted-pop", encrypted_pop,
- "Pop an encryption container." },
+ "Pop the most recent encryption container started by either"
+ " --encrypted or --encrypted-mdc." },
{ "--compressed", NULL, "Create a compressed data packet." },
{ "--literal", literal, "Create a literal (plaintext) data packet." },
{ "--signature", signature, "Create a signature packet." },
@@ -2534,7 +2535,9 @@ encrypted (const char *option, int argc, char *argv[], void *cookie)
argc, argv);
if (! session_key.algo)
- log_fatal ("%s: no session key configured.\n", option);
+ log_fatal ("%s: no session key configured\n"
+ " (use e.g. --sk-esk PASSWORD or --pk-esk KEYID).\n",
+ option);
memset (&e, 0, sizeof (e));
/* We only need to set E->LEN, E->EXTRALEN (if E->LEN is not
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list