From 354b1a12c1f588cdfa2f35896ada4c9ba20e3a28 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 30 Oct 2011 00:00:16 +0000 Subject: gnupdate: Fix auto-downloading of GPG keys. * maintainers/scripts/gnu/gnupdate (gnupg-verify): Always return STATUS. svn path=/nixpkgs/trunk/; revision=30108 --- maintainers/scripts/gnu/gnupdate | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'maintainers/scripts/gnu') diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 4fbf5b6d43a8..c33fc00e7aeb 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -414,8 +414,7 @@ replaced by the result of their application to DERIVATIONS, a vhash." (define %openpgp-key-server "keys.gnupg.net") (define (gnupg-verify sig file) - "Verify signature SIG for FILE. Return a status s-exp or #f if GnuPG -failed." + "Verify signature SIG for FILE. Return a status s-exp if GnuPG failed." (define (status-line->sexp line) ;; See file `doc/DETAILS' in GnuPG. @@ -480,9 +479,10 @@ failed." (let* ((pipe (open-pipe* OPEN_READ %gpg-command "--status-fd=1" "--verify" sig file)) (status (parse-status pipe))) - (if (pipe-failed? pipe) - #f - status))) + ;; Ignore PIPE's exit status since STATUS above should contain all the + ;; info we need. + (close-pipe pipe) + status)) (define (gnupg-status-good-signature? status) "If STATUS, as returned by `gnupg-verify', denotes a good signature, return -- cgit 1.4.1