diff options
| author | NIIBE Yutaka <[email protected]> | 2016-06-28 06:56:48 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-06-28 06:56:48 +0000 |
| commit | 52f65281f9743c42a48bf5a3354c9ab0ecdb681a (patch) | |
| tree | 2e35aea8f498ccc4cb8eb0763ed2af9831932ed4 /g10/mainproc.c | |
| parent | build: Add aclocal macro from pkg-config. (diff) | |
| download | gnupg-52f65281f9743c42a48bf5a3354c9ab0ecdb681a.tar.gz gnupg-52f65281f9743c42a48bf5a3354c9ab0ecdb681a.zip | |
g10: Fix --list-packets.
* g10/gpg.c (main): Call set_packet_list_mode after assignment of
opt.list_packets.
* g10/mainproc.c (do_proc_packets): Don't stop processing with
--list-packets as the comment says.
* g10/options.h (list_packets): Fix the comment.
* g10/parse-packet.c: Fix the condition for opt.list_packets.
--
Debian-bug-id: 828109
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index bd738abaa..c191fe03e 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1328,7 +1328,7 @@ do_proc_packets (ctrl_t ctrl, CTX c, iobuf_t a) /* Stop processing when an invalid packet has been encountered * but don't do so when we are doing a --list-packets. */ if (gpg_err_code (rc) == GPG_ERR_INV_PACKET - && opt.list_packets != 2 ) + && opt.list_packets == 0) break; continue; } |