[pacman-dev] [PATCH] makepkg - add check for valid options in PKGBUILD

[Allan McRae]

This patch removes the code block in makepkg that checked for
depreciated options in a PKGBUILD and provided a workaround.
Unknown and depreciated options are upgraded to error conditions.

Also, removed TODO regarding including install script if exists and
$install is unset.  That should never happen.

Signed-off-by: Allan McRae <mcrae_allan at hotmail.com>
---
 scripts/makepkg.sh.in |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 53d7f98..72d740f 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -38,6 +38,8 @@ confdir='@sysconfdir@'
 startdir="$PWD"
 srcdir="$startdir/src"
 pkgdir="$startdir/pkg"
+known_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'ccache' 'distcc' 'makeflags' 'force')
+readonly -a known_options
 
 # Options
 ASROOT=0
@@ -182,25 +184,6 @@ check_option() {
 		return
 	fi
 
-	# BEGIN DEPRECATED
-	# TODO: This code should be removed in the next release of makepkg.
-	local needle=$(echo $1 | tr [:upper:] [:lower:])
-	local opt
-	for opt in ${options[@]}; do
-		opt=$(echo $opt | tr [:upper:] [:lower:])
-		if [ "$opt" = "no$needle" ]; then
-			warning "$(gettext "Options beginning with 'no' will be deprecated in the next version of makepkg!")"
-			plain "$(gettext "Please replace 'no' with '!': %s -> %s.")" "no$needle" "!$needle"
-			echo 'n' # Disabled
-			return
-		elif [ "$opt" = "keepdocs" -a "$needle" = "docs" ]; then
-			warning "$(gettext "Option 'keepdocs' may not work as intended. Please replace with 'docs'.")"
-			echo 'y' # Enabled
-			return
-		fi
-	done
-	# END DEPRECATED
-
 	# fall back to makepkg.conf options
 	ret=$(in_opt_array "$1" ${OPTIONS[@]})
 	if [ "$ret" != '?' ]; then
@@ -870,7 +853,6 @@ create_package() {
 	local comp_files=".PKGINFO"
 
 	# check for an install script
-	# TODO: should we include ${pkgname}.install if it exists and $install is unset?
 	if [ "$install" != "" ]; then
 		msg2 "$(gettext "Adding install script...")"
 		cp "$startdir/$install" .INSTALL
@@ -1369,6 +1351,25 @@ if [ "$install" -a ! -f "$install" ]; then
 	exit 1
 fi
 
+valid_options=0
+for opt in ${options[@]}; do
+	known=1
+	# check if option matches a known option or its inverse
+	for kopt in ${known_options[@]}; do
+		if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then
+			known=0
+		fi
+	done
+	if [ $known -eq 1 ]; then
+		error "$(gettext "options array contains unknown option '%s'")" "$opt"
+		valid_options=1
+	fi
+done
+if [ $valid_options -eq 1 ]; then
+	exit 1
+fi
+unset valid_options opt known kopt
+
 # We need to run devel_update regardless of whether we are in the fakeroot
 # build process so that if the user runs makepkg --forcever manually, we
 # 1) output the correct pkgver, and 2) use the correct filename when
-- 
1.5.5.1