diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-24 10:11:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-24 10:11:38 +0200 |
| commit | 11da634a6e64afa2904542e2174aa2a185f9ac3a (patch) | |
| tree | 5aeb8e6bd01761813650067af492b1c336886e34 /guix/scripts/package.scm | |
| parent | e5efdbce21a0afcbb3e73cc7b59111ccf62cb532 (diff) | |
| parent | 7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index a43c96516f..f03741aa9e 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -607,7 +607,11 @@ and upgrades." (let-values (((package output) (specification->package+output spec))) (package->manifest-entry* package output)))) - (_ #f)) + (('install . obj) + (leave (G_ "cannot install non-package object: ~s~%") + obj)) + (_ + #f)) opts)) (fold manifest-transaction-install-entry @@ -760,7 +764,8 @@ processed, #f otherwise." (('show requested-name) (let-values (((name version) (package-name->name+version requested-name))) - (match (find-packages-by-name name version) + (match (remove package-superseded + (find-packages-by-name name version)) (() (leave (G_ "~a~@[@~a~]: package not found~%") name version)) (packages |