diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-27 23:33:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-27 23:33:48 +0200 |
| commit | 5cc1075a76392666d3d733837f5c6252b1e48002 (patch) | |
| tree | aff2a303881a6fe53021a6e78a767958e608719b /gnu/packages.scm | |
| parent | 9c2563a80b6f1d8fb8677f5314e6180ea9916aa5 (diff) | |
| parent | c30d117822a8ca26cd8c06c0a3974955bef68eac (diff) | |
| download | patches-5cc1075a76392666d3d733837f5c6252b1e48002.tar patches-5cc1075a76392666d3d733837f5c6252b1e48002.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages.scm')
| -rw-r--r-- | gnu/packages.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm index 2d7622d397..47e4f473b5 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -515,14 +515,18 @@ optionally contain a version number and an output name, as in these examples: guile@2.0.9:debug If SPEC does not specify a version number, return the preferred newest -version; if SPEC does not specify an output, return OUTPUT." +version; if SPEC does not specify an output, return OUTPUT. + +When OUTPUT is false and SPEC does not specify any output, return #f as the +output." (let-values (((name version sub-drv) (package-specification->name+version+output spec output))) (match (%find-package spec name version) (#f (values #f #f)) (package - (if (member sub-drv (package-outputs package)) + (if (or (and (not output) (not sub-drv)) + (member sub-drv (package-outputs package))) (values package sub-drv) (leave (G_ "package `~a' lacks output `~a'~%") (package-full-name package) |