From 27afb11a2284aaea187897c0fe32e1d50b49d654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 24 Sep 2014 19:08:03 +0200 Subject: [PATCH] gnupg: Correctly parse current 'SIG_ID' lines. * guix/gnupg.scm (gnupg-verify)[sigid-rx]: Adjust to handle current signature ID encoding. --- guix/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/gnupg.scm b/guix/gnupg.scm index 29ddc78e27..d1d8b377e1 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2013 Ludovic Courtès +;;; Copyright © 2010, 2011, 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. @@ -54,7 +54,7 @@ ;; See file `doc/DETAILS' in GnuPG. (define sigid-rx (make-regexp - "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)")) + "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9+/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)")) (define goodsig-rx (make-regexp "^\\[GNUPG:\\] GOODSIG ([[:xdigit:]]+) (.+)$")) (define validsig-rx