From 29be38d2671db067c86e07fa6177cd14055a32ea Mon Sep 17 00:00:00 2001
From: Justin Davis <jrcd83@gmail.com>
Date: Fri, 1 Jun 2012 13:34:51 -0400
Subject: Fix error handling when prepkg fails.

Typo fixed in prepkg. Do not duplicate pkgver unless
we are going to modify the package. Pipes screw up
the error code returned. vervar silently ignores a
missing _ver field.
---
 bin/genpkg | 16 ++++++++--------
 bin/prepkg |  2 +-
 bin/vervar |  6 +-----
 3 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'bin')

diff --git a/bin/genpkg b/bin/genpkg
index ef78e29..047a07f 100755
--- a/bin/genpkg
+++ b/bin/genpkg
@@ -104,20 +104,20 @@ do
 	# Duplicate the version in case modpkg modifies it. vervar will remove a
 	# redundant ver field that is the same as pkgver.
 	trap 'rm -f PKGDATA' 1 2 15
-	if PREPSPATH="$prepd" PKGVAR="$vard" prepkg "$pkg" | dupver > PKGDATA
-	then
-		echo "$pkgd/$pkg"
-	else
-		rm PKGDATA
-		exit "$?"
-	fi
+	PREPSPATH="$prepd" PKGVAR="$vard" prepkg "$pkg" > PKGDATA
+	ret=$?
+	case $ret in
+	0)	echo "$pkgd/$pkg" ;;
+	*)	rm PKGDATA
+		exit $ret
+	esac
 	trap '' 1 2 15
 
 	mod="$modsd/$pkg"
 	if [ -f "$mod" -a -r "$mod" ]
 	then
 		trap 'rm -f PKGDATA.new' 1 2 15
-		if modpkg "$mod" < PKGDATA > PKGDATA.new
+		if cat PKGDATA | dupver | modpkg "$mod" > PKGDATA.new
 		then
 			echo "Modified with $mod." 1>&2
 			mv PKGDATA.new PKGDATA
diff --git a/bin/prepkg b/bin/prepkg
index 11df1fa..0b456d8 100755
--- a/bin/prepkg
+++ b/bin/prepkg
@@ -44,7 +44,7 @@ do
 		exit 0 ;;
 	1)	err "$flav encountered an error" ;;
 	2)	;; # loop
-	*)	err "$flav returned error code $metaret" ;;
+	*)	err "$flav returned error code $prepret" ;;
 	esac
 done
 
diff --git a/bin/vervar b/bin/vervar
index ce907da..480d98f 100755
--- a/bin/vervar
+++ b/bin/vervar
@@ -26,12 +26,8 @@ END {
 	if(error) {
 		exit(error)
 	}
-	if(!ver){
-		print prog ": error: ver field is missing (or zero)" | "cat 1>&2"
-		exit(1)
-	}
 
-	if("" pkgver == ver){
+	if(!ver || "" pkgver == ver){
 		# Don't use the $_ver variable if $pkgver and $_ver are identical.
 		skipver = 1
 		vervar = "pkgver"
-- 
cgit v1.2.3-24-g4f1b