makepkg: merge validate_pkgver into check_pkgver

The check that pkgver is non-empty done in check_pkgver should also be
performed after running the pkgver() function.  Merge validate_pkgver
into check_pkgver and run check_pkgver after updating pkgver.

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 4885341c..11e64593 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -824,7 +824,7 @@ download_sources() {
 # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver
 update_pkgver() {
 	newpkgver=$(run_function_safe pkgver)
-	if ! validate_pkgver "$newpkgver"; then
+	if ! check_pkgver "$newpkgver"; then
 		error "$(gettext "pkgver() generated an invalid version: %s")" "$newpkgver"
 		exit 1
 	fi