nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix package: '--show' errors when asked for a non-existent package. 

Fixes <https://bugs.gnu.org/33323>.
Reported by swedebugia <swedebugia@riseup.net>.

* guix/scripts/package.scm (process-query): Call 'leave' when
'find-packages-by-name' returns the empty list.
* tests/guix-package.sh: Test it.
This commit is contained in:
Ludovic Courtès 2018-11-11 17:13:20 +01:00
parent 9c001c07d4
commit 652163154c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/scripts/package.scm
View File

@ -771,9 +771,13 @@ processed, #f otherwise."
(('show requested-name) (('show requested-name)
(let-values (((name version) (let-values (((name version)
(package-name->name+version requested-name))) (package-name->name+version requested-name)))
(match (find-packages-by-name name version)
(()
(leave (G_ "~a~@[@~a~]: package not found~%") name version))
(packages
(leave-on-EPIPE (leave-on-EPIPE
(for-each (cute package->recutils <> (current-output-port)) (for-each (cute package->recutils <> (current-output-port))
(find-packages-by-name name version))) packages))))
#t)) #t))
(('search-paths kind) (('search-paths kind)

4
tests/guix-package.sh
View File

@ -106,6 +106,10 @@ guix package --show=guile | grep "^name: guile"
# Ensure `--show' doesn't fail for packages with non-package inputs. # Ensure `--show' doesn't fail for packages with non-package inputs.
guix package --show=texlive guix package --show=texlive
# Fail for non-existent packages or package/version pairs.
if guix package --show=does-not-exist; then false; else true; fi
if guix package --show=emacs@42; then false; else true; fi
# Search. # Search.
LC_MESSAGES=C LC_MESSAGES=C
export LC_MESSAGES export LC_MESSAGES