From 2f59996c54da473294de4adf44d521299a045a84 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 2 Jan 2009 04:07:13 +1000 Subject: makepkg: detect incorrect usage of provides array Using > or < in the provides array is wrong so make it cause an error. Fixes FS#12540. Also, use bash substitution rather than spawning new processes where possible in the error checking. Move split package detection to a better position. Signed-off-by: Allan McRae [Dan: backport to maint] Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b18665c5..04d2aca1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1439,11 +1439,11 @@ if [ -z "$pkgrel" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" exit 1 fi -if [ $(echo "$pkgver" | grep '-') ]; then +if [ "$pkgver" != "${pkgver//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" exit 1 fi -if [ $(echo "$pkgrel" | grep '-') ]; then +if [ "$pkgrel" != "${pkgrel//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" exit 1 fi @@ -1465,6 +1465,14 @@ if ! in_array $CARCH ${arch[@]}; then fi fi +for provide in ${provides[@]}; do + if [ $provide != ${provide///} ]; then + error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" + exit 1 + fi +done +unset provide + if [ "$install" -a ! -f "$install" ]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" exit 1 -- cgit v1.2.3-70-g09d2