From 59992eb8c3c5cb3919e0763c598f1928a7cf2413 Mon Sep 17 00:00:00 2001 From: Isis Lovecruft Date: Wed, 19 Nov 2014 03:30:16 +0000 Subject: [PATCH] Put verbosity args before other options/args. * FIXES Issue #76: https://github.com/isislovecruft/python-gnupg/issues/76 --- gnupg/_meta.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnupg/_meta.py b/gnupg/_meta.py index d979167..8d21d60 100644 --- a/gnupg/_meta.py +++ b/gnupg/_meta.py @@ -500,11 +500,9 @@ class GPGBase(object): if self.use_agent: cmd.append('--use-agent') else: cmd.append('--no-use-agent') - if self.options: - [cmd.append(opt) for opt in iter(_sanitise_list(self.options))] - if args: - [cmd.append(arg) for arg in iter(_sanitise_list(args))] - + # The arguments for debugging and verbosity should be placed into the + # cmd list before the options/args in order to resolve Issue #76: + # https://github.com/isislovecruft/python-gnupg/issues/76 if self.verbose: cmd.append('--debug-all') @@ -517,6 +515,11 @@ class GPGBase(object): else: cmd.append('--debug-level %s' % self.verbose) + if self.options: + [cmd.append(opt) for opt in iter(_sanitise_list(self.options))] + if args: + [cmd.append(arg) for arg in iter(_sanitise_list(args))] + return cmd def _open_subprocess(self, args=None, passphrase=False):