guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/14: guix: Match package names case-insensitively.


From: guix-commits
Subject: 01/14: guix: Match package names case-insensitively.
Date: Sat, 16 Mar 2019 18:35:27 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit b56d160944ace6e06fcfe5a36310c98e6a213b87
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sat Mar 16 07:01:26 2019 +0100

    guix: Match package names case-insensitively.
    
    * guix/scripts/package.scm (options->upgrade-predicate, process-query):
    Use REGEXP/ICASE when matching package names.
---
 guix/scripts/package.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index efff511..b0c6a7c 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016 Roel Janssen <address@hidden>
 ;;; Copyright © 2016 Benz Schenk <address@hidden>
 ;;; Copyright © 2016 Chris Marusich <address@hidden>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -526,14 +527,14 @@ upgrading, #f otherwise."
   (define upgrade-regexps
     (filter-map (match-lambda
                   (('upgrade . regexp)
-                   (make-regexp* (or regexp "")))
+                   (make-regexp* (or regexp "") regexp/icase))
                   (_ #f))
                 opts))
 
   (define do-not-upgrade-regexps
     (filter-map (match-lambda
                   (('do-not-upgrade . regexp)
-                   (make-regexp* regexp))
+                   (make-regexp* regexp regexp/icase))
                   (_ #f))
                 opts))
 
@@ -686,7 +687,7 @@ processed, #f otherwise."
        #t)
 
       (('list-installed regexp)
-       (let* ((regexp    (and regexp (make-regexp* regexp)))
+       (let* ((regexp    (and regexp (make-regexp* regexp regexp/icase)))
               (manifest  (profile-manifest profile))
               (installed (manifest-entries manifest)))
          (leave-on-EPIPE
@@ -702,7 +703,7 @@ processed, #f otherwise."
          #t))
 
       (('list-available regexp)
-       (let* ((regexp    (and regexp (make-regexp* regexp)))
+       (let* ((regexp    (and regexp (make-regexp* regexp regexp/icase)))
               (available (fold-available-packages
                           (lambda* (name version result
                                          #:key outputs location



reply via email to

[Prev in Thread] Current Thread [Next in Thread]