From 893ff3a536d34cbd1dc3a00ccda07b461cad04e7 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 18 Mar 2011 15:17:53 +1000 Subject: [PATCH] makepkg: Improve optdepends extraction Prevents issues where optdepends descriptions contain a bracket. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 23081fe..d8737ff 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1276,7 +1276,7 @@ check_sanity() { done local optdepends_list=() - eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") + eval $(awk '/^[[:space:]]*optdepends=\(/,/\)[[:space:]]*(|#.*)$/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then -- 1.7.4.1