Make a valid Emacs version string before building.

In certain cases there are version numbers that are valid to Emacs but
get translated into something different after parsing to a
list (version-to-list) and then back to a string (package-version-join).
So before we start passing around the original version string we simply
regenerate it using the Emacs functions so it is consistent during the
building process.

Fixes #1952
Fixes #2000
This commit is contained in:
Donald Curtis 2014-09-12 06:30:14 -04:00
parent aa04ccd0ac
commit 16beacfdcf

View file

@ -970,8 +970,10 @@ and a cl struct in Emacs HEAD. This wrapper normalises the results."
(make-directory package-build-archive-dir))
(pb/message "\n;;; %s\n" file-name)
(let* ((version (or (package-build-checkout name rcp pkg-working-dir)
(error "No valid package version found!")))
(let* ((version (package-version-join
(version-to-list
(or (package-build-checkout name rcp pkg-working-dir)
(error "No valid package version found!")))))
(default-directory package-build-working-dir)
(start-time (current-time))
(archive-entry (package-build-package (symbol-name name)