diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-08 11:00:06 -0400 |
| commit | e759c0a38c799f2d03b3454e9ca6acf2262dc957 (patch) | |
| tree | 08f5a1414410bc6719205090ac07484b308ba918 /guix/scripts/package.scm | |
| parent | 11459384968f654c42ad7dba4443dada35191f5b (diff) | |
| parent | 4a4cbd0bdd2ad8c4f37c3ffdd69596ef1ef41d91 (diff) | |
| download | gnu-guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar gnu-guix-e759c0a38c799f2d03b3454e9ca6acf2262dc957.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 6ecf37e1a6..95c0130c95 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -305,10 +305,12 @@ current settings and report only settings not already effective." ;; Use 'find-best-packages-by-name' and not 'find-packages-by-name'; ;; the former traverses the module tree only once and then allows for ;; efficient access via a vhash. - (match (or (find-best-packages-by-name name version) - (find-best-packages-by-name name #f)) + (match (find-best-packages-by-name name version) ((p _ ...) p) - (_ #f))))) + (_ + (match (find-best-packages-by-name name #f) + ((p _ ...) p) + (_ #f))))))) (define search-path-definition (match-lambda |