summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-11-19 23:21:54 +0100
committerLudovic Courtès <ludo@gnu.org>2012-11-19 23:21:54 +0100
commitd9d0536340b4bc310968267e70279544e5aa9b5e (patch)
treedd9a2ecb2f2e7fdc6ce0b6a02097d299f93791f4
parent64fc89b6ec0928f7bbd7011d6a8dc325d63f4fe5 (diff)
downloadpatches-d9d0536340b4bc310968267e70279544e5aa9b5e.tar
patches-d9d0536340b4bc310968267e70279544e5aa9b5e.tar.gz
guix-package: Record the correct version string in manifests.
* guix-package.in (guix-package)[find-package]: Return (package-version p), not VERSION.
-rw-r--r--guix-package.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/guix-package.in b/guix-package.in
index 4e66dccdc0..c0b5cea2da 100644
--- a/guix-package.in
+++ b/guix-package.in
@@ -305,15 +305,16 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
(package-name->name+version name)))
(match (find-packages-by-name name version)
((p)
- (list name version sub-drv p))
+ (list name (package-version p) sub-drv p))
((p p* ...)
(format (current-error-port)
(_ "warning: ambiguous package specification `~a'~%")
request)
(format (current-error-port)
- (_ "warning: choosing ~s~%")
- p)
- (list name version sub-drv p))
+ (_ "warning: choosing ~a from ~a~%")
+ (package-full-name p)
+ (location->string (package-location p)))
+ (list name (package-version p) sub-drv p))
(()
(leave (_ "~a: package not found~%") request)))))