From b2ba65c8970a1371244015cc918257f9972454ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 15 Oct 2013 22:59:50 +0200 Subject: [PATCH] guix package: '--search' matches against package names. * guix/scripts/package.scm (find-packages-by-description): Return packages whose name matches RX. --- guix/scripts/package.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 5c7c165cbb..0b9e0c4f6f 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -325,8 +325,8 @@ (define generation-ctime-alist (else #f))) (define (find-packages-by-description rx) - "Search in SYNOPSIS and DESCRIPTION using RX. Return a list of -matching packages." + "Return the list of packages whose name, synopsis, or description matches +RX." (define (same-location? p1 p2) ;; Compare locations of two packages. (equal? (package-location p1) (package-location p2))) @@ -337,7 +337,8 @@ (define (same-location? p1 p2) (define matches? (cut regexp-exec rx <>)) - (if (or (and=> (package-synopsis package) + (if (or (matches? (gettext (package-name package))) + (and=> (package-synopsis package) (compose matches? gettext)) (and=> (package-description package) (compose matches? gettext)))