guix-package: Record the correct version string in manifests.

* guix-package.in (guix-package)[find-package]: Return (package-version p),
  not VERSION.
This commit is contained in:
Ludovic Courtès 2012-11-19 23:21:54 +01:00
parent 64fc89b6ec
commit d9d0536340

View file

@ -305,15 +305,16 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
(package-name->name+version name))) (package-name->name+version name)))
(match (find-packages-by-name name version) (match (find-packages-by-name name version)
((p) ((p)
(list name version sub-drv p)) (list name (package-version p) sub-drv p))
((p p* ...) ((p p* ...)
(format (current-error-port) (format (current-error-port)
(_ "warning: ambiguous package specification `~a'~%") (_ "warning: ambiguous package specification `~a'~%")
request) request)
(format (current-error-port) (format (current-error-port)
(_ "warning: choosing ~s~%") (_ "warning: choosing ~a from ~a~%")
p) (package-full-name p)
(list name version sub-drv p)) (location->string (package-location p)))
(list name (package-version p) sub-drv p))
(() (()
(leave (_ "~a: package not found~%") request))))) (leave (_ "~a: package not found~%") request)))))