summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-09-24 19:08:03 +0200
committerLudovic Courtès <ludo@gnu.org>2014-09-24 19:08:03 +0200
commit27afb11a2284aaea187897c0fe32e1d50b49d654 (patch)
tree8dff0bb076b90a82b42cef9661be1e4fd3266b93
parent3f6f7b36d3bc919600cc35b5467c13634f9e4d53 (diff)
downloadguix-27afb11a2284aaea187897c0fe32e1d50b49d654.tar.gz
gnupg: Correctly parse current 'SIG_ID' lines.
* guix/gnupg.scm (gnupg-verify)[sigid-rx]: Adjust to handle current
  signature ID encoding.
-rw-r--r--guix/gnupg.scm4
1 files 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 <ludo@gnu.org>
+;;; Copyright © 2010, 2011, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;;
 ;;; 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