Author: ludo
Date: Sun Oct 30 00:00:16 2011
New Revision: 30108
URL: https://nixos.org/websvn/nix/?rev=30108&sc=1
Log:
gnupdate: Fix auto-downloading of GPG keys.
* maintainers/scripts/gnu/gnupdate (gnupg-verify): Always return STATUS.
Modified:
nixpkgs/trunk/maintainers/scripts/gnu/gnupdate
Modified: nixpkgs/trunk/maintainers/scripts/gnu/gnupdate
==============================================================================
--- nixpkgs/trunk/maintainers/scripts/gnu/gnupdate Sun Oct 30 00:00:11
2011 (r30107)
+++ nixpkgs/trunk/maintainers/scripts/gnu/gnupdate Sun Oct 30 00:00:16
2011 (r30108)
@@ -414,8 +414,7 @@
(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 @@
(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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
