diff mbox series

[bug#50281,RFC] build/jami-service: Fix range ends in account-fingerprint-rx.

Message ID 20210830173935.31933-1-maximedevos@telenet.be
State Accepted
Headers show
Series [bug#50281,RFC] build/jami-service: Fix range ends in account-fingerprint-rx. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

M Aug. 30, 2021, 5:39 p.m. UTC
This broke compilation of Guix with guile@3.0.2 with:

  In procedure make-regexp: Invalid range end

The fix is to replace [0-9A-f] with [0-9A-Fa-f].
TODO: were both uppercase and lowercase intended, or
only one of the two?

* gnu/build/jami-service.scm
  (account-fingerprint-rx): Correct regexp.
---
 gnu/build/jami-service.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maxim Cournoyer Aug. 30, 2021, 6:26 p.m. UTC | #1
Hi Maxime,

Maxime Devos <maximedevos@telenet.be> writes:

> This broke compilation of Guix with guile@3.0.2 with:
>
>   In procedure make-regexp: Invalid range end

Uh, good catch!  Makes me curious to know what was changed in 3.0.7!

> The fix is to replace [0-9A-f] with [0-9A-Fa-f].
> TODO: were both uppercase and lowercase intended, or
> only one of the two?

Yes, Jami does not care about the case of the Jami account fingerprint
(IIRC).  I've now edited out the TODO.

> * gnu/build/jami-service.scm
>   (account-fingerprint-rx): Correct regexp.
> ---
>  gnu/build/jami-service.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/build/jami-service.scm b/gnu/build/jami-service.scm
> index d44e87387d..ddfc8cf937 100644
> --- a/gnu/build/jami-service.scm
> +++ b/gnu/build/jami-service.scm
> @@ -96,7 +96,7 @@ before each retry."
>                   (list key value)))
>                alist))
>  
> -(define account-fingerprint-rx (make-regexp "[0-9A-f]{40}"))
> +(define account-fingerprint-rx (make-regexp "[0-9A-Fa-f]{40}"))
>  
>  (define (account-fingerprint? val)
>    "A Jami account fingerprint is 40 characters long and only contains

And pushed as a3bfe953d2.

Thank you!

Closing,

Maxim
diff mbox series

Patch

diff --git a/gnu/build/jami-service.scm b/gnu/build/jami-service.scm
index d44e87387d..ddfc8cf937 100644
--- a/gnu/build/jami-service.scm
+++ b/gnu/build/jami-service.scm
@@ -96,7 +96,7 @@  before each retry."
                  (list key value)))
               alist))
 
-(define account-fingerprint-rx (make-regexp "[0-9A-f]{40}"))
+(define account-fingerprint-rx (make-regexp "[0-9A-Fa-f]{40}"))
 
 (define (account-fingerprint? val)
   "A Jami account fingerprint is 40 characters long and only contains