From mboxrd@z Thu Jan 1 00:00:00 1970 From: "pelzflorian (Florian Pelz)" Subject: bug#39970: guix commands broken on Azerbaijani 'az_AZ' and Turkish 'tr_TR' locales Date: Tue, 17 Mar 2020 10:44:43 +0100 Message-ID: <20200317094443.cnajoi4yuzvxaafe@pelzflorian.localdomain> References: <20200307120052.ocwzphlvemvmb2ts@pelzflorian.localdomain> <20200307152003.myj7jkjthokbmark@pelzflorian.localdomain> <20200308070804.ylpb5yrwpgbc3p3w@pelzflorian.localdomain> <8736ah1mxb.fsf@gnu.org> <20200312110206.2hsinzejnmcefmot@pelzflorian.localdomain> <874kutsgmx.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="2sl72hxfrvw7sfvd" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:51829) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE8mZ-0001xP-QR for bug-guix@gnu.org; Tue, 17 Mar 2020 05:45:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE8mT-0007dv-Qs for bug-guix@gnu.org; Tue, 17 Mar 2020 05:45:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jE8mT-0007cr-NM for bug-guix@gnu.org; Tue, 17 Mar 2020 05:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jE8mT-00071j-L2 for bug-guix@gnu.org; Tue, 17 Mar 2020 05:45:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: Content-Disposition: inline In-Reply-To: <874kutsgmx.fsf@gnu.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 39970@debbugs.gnu.org --2sl72hxfrvw7sfvd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Thu, Mar 12, 2020 at 05:05:26PM +0100, Ludovic Courtès wrote: > "pelzflorian (Florian Pelz)" skribis: > > Why would not using a regexp be better? > > It reduces reliance on libc, reduces complexity, and performs better as > noted in the commit log of 35eb77b09d957019b2437e7681bd88013d67d3cd. Thank you for your wisdom. I hope the attached patch is OK. `LC_ALL=en_US.utf8 make check` is mostly fine (except tests/pack.scm, which also failed before). Manual testing of `./pre-inst-env guix environment` works. `LC_ALL=tr_TR.utf8 make check` is still very unhappy though. There are many failures. I will continue to investigate later today. Regards, Florian --2sl72hxfrvw7sfvd Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-store-Fix-many-guix-commands-failing-on-some-locales.patch" Content-Transfer-Encoding: 8bit From: Florian Pelz Date: Thu, 12 Mar 2020 11:08:16 +0100 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [PATCH] store: Fix many guix commands failing on some locales. Partly fixes bug #39970 (see: https://bugs.gnu.org/39970). At least 'guix environment', 'guix install' and 'guix pull' on 'az_AZ.utf8' and 'tr_TR.utf8' were affected. * guix/store.scm (store-path-hash-part): Move base path detection to ... (store-path-base): ... this new exported procedure. (store-path-package-name): Use it instead of locale-dependent regexps. (store-regexp*): Remove. --- guix/store.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/guix/store.scm b/guix/store.scm index f99fa581a8..5465204f5f 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Jan Nieuwenhuizen ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +44,6 @@ #:use-module (srfi srfi-35) #:use-module (srfi srfi-39) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:use-module (ice-9 vlist) #:use-module (ice-9 popen) #:use-module (ice-9 threads) @@ -172,6 +172,7 @@ store-path? direct-store-path? derivation-path? + store-path-base store-path-package-name store-path-hash-part direct-store-path @@ -1943,29 +1944,26 @@ valid inputs." "Return #t if PATH is a derivation path." (and (store-path? path) (string-suffix? ".drv" path))) -(define store-regexp* - ;; The substituter makes repeated calls to 'store-path-hash-part', hence - ;; this optimization. - (mlambda (store) - "Return a regexp matching a file in STORE." - (make-regexp (string-append "^" (regexp-quote store) - "/([0-9a-df-np-sv-z]{32})-([^/]+)$")))) +(define (store-path-base path) + "Return the base path of a path in the store." + (and (string-prefix? (%store-prefix) path) + (let ((base (string-drop path (+ 1 (string-length (%store-prefix)))))) + (and (> (string-length base) 33) + (not (string-index base #\/)) + base)))) (define (store-path-package-name path) "Return the package name part of PATH, a file name in the store." - (let ((path-rx (store-regexp* (%store-prefix)))) - (and=> (regexp-exec path-rx path) - (cut match:substring <> 2)))) + (let ((base (store-path-base path))) + (string-drop base (+ 32 1)))) ;32 hash part + 1 hyphen (define (store-path-hash-part path) "Return the hash part of PATH as a base32 string, or #f if PATH is not a syntactically valid store path." - (and (string-prefix? (%store-prefix) path) - (let ((base (string-drop path (+ 1 (string-length (%store-prefix)))))) - (and (> (string-length base) 33) - (let ((hash (string-take base 32))) - (and (string-every %nix-base32-charset hash) - hash)))))) + (let* ((base (store-path-base path)) + (hash (string-take base 32))) + (and (string-every %nix-base32-charset hash) + hash))) (define (derivation-log-file drv) "Return the build log file for DRV, a derivation file name, or #f if it -- 2.25.1 --2sl72hxfrvw7sfvd--