search for: 29f271b

Parse the gpg status output directly within import_keyfile, returning just the key fingerprint. Just code motion, no actual behaviour changes. --- builder/sigchecker.ml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 0c292fb..a1a4220 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml

...he status output anyway to check the validation result, so this should be harmless (and the full gpg output is printed in verbose mode anyway). --- builder/sigchecker.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index b54977f..29f271b 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -159,7 +159,7 @@ and do_verify t args = let cmd = sprintf "%s --homedir %s --verify%s --status-file %s %s" t.gpg t.gpghome - (if t.verbose then "" else " -q --logger-file /dev/null&quo...

...e; } -val get_index : verbose:bool -> downloader:Downloader.t -> sigchecker:Sigchecker.t -> Sources.source -> index +val get_index : downloader:Downloader.t -> sigchecker:Sigchecker.t -> Sources.source -> index diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 29f271b..a8cc704 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -25,7 +25,6 @@ open Printf open Unix type t = { - verbose : bool; gpg : string; fingerprint : string; check_signature : bool; @@ -33,13 +32,13 @@ type t = { } (* Import the specified key file. *) -let impor...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623