[pacman-dev] [PATCH] makepkg: handle "epoch=" in PKGBUILD with pkgver function

[Allan McRae]

After resourcing the PKGBUILD in update_pkgver(), set the epoch to 0
if it is empty.  Also adjust the get_full_version function to be more
robust if epoch somehow still is empty.

Fixes FS#41022.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 scripts/makepkg.sh.in | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e20b707..779ebcb 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -824,6 +824,7 @@ update_pkgver() {
 			fi
 			@SEDINPLACE@ "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE"
 			source_safe "$BUILDFILE"
+			epoch=${epoch:-0}
 			local fullver=$(get_full_version)
 			msg "$(gettext "Updated version: %s")" "$pkgbase $fullver"
 		else
@@ -846,10 +847,10 @@ missing_source_file() {
 ##
 get_full_version() {
 	if [[ -z $1 ]]; then
-		if [[ $epoch ]] && (( ! $epoch )); then
-			printf "%s\n" "$pkgver-$pkgrel"
-		else
+		if [[ -n $epoch ]] && (( $epoch )); then
 			printf "%s\n" "$epoch:$pkgver-$pkgrel"
+		else
+			printf "%s\n" "$pkgver-$pkgrel"
 		fi
 	else
 		for i in pkgver pkgrel epoch; do
@@ -857,10 +858,10 @@ get_full_version() {
 			eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
 			[[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
 		done
-		if (( ! $epoch_override )); then
-			printf "%s\n" "$pkgver_override-$pkgrel_override"
-		else
+		if [[ -n $epoch_override ]] && (( $epoch_override )); then
 			printf "%s\n" "$epoch_override:$pkgver_override-$pkgrel_override"
+		else
+			printf "%s\n" "$pkgver_override-$pkgrel_override"
 		fi
 	fi
 }
-- 
2.0.1