summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-03-18 06:17:53 +0100
committerDan McGee <dan@archlinux.org>2011-03-20 17:15:34 +0100
commitb6cada3eed82a305dbc656baa7f046a73dcce25a (patch)
tree7333918014ab4c4dbffa7e3bb5e8b121227c749e
parentb48f71841712d1839f5e900f1ec0fdf5665354ba (diff)
downloadpacman-b6cada3eed82a305dbc656baa7f046a73dcce25a.tar.gz
pacman-b6cada3eed82a305dbc656baa7f046a73dcce25a.tar.xz
makepkg: Improve optdepends extraction
Prevents issues where optdepends descriptions contain a bracket. Also, strip all comments from arrays before joining them. Fixes FS#23307. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 23081fec..bb7616cf 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1258,7 +1258,8 @@ check_sanity() {
fi
local provides_list=()
- eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/")
+ eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \
+ sed -e "s/provides=/provides_list+=/" -e "s/#.*//")
for i in ${provides_list[@]}; do
if [[ $i != ${i//</} || $i != ${i//>/} ]]; then
error "$(gettext "Provides array cannot contain comparison (< or >) operators.")"
@@ -1267,7 +1268,8 @@ check_sanity() {
done
local backup_list=()
- eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/")
+ eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \
+ sed -e "s/backup=/backup_list+=/" -e "s/#.*//")
for i in "${backup_list[@]}"; do
if [[ ${i:0:1} = "/" ]]; then
error "$(gettext "Backup entry should not contain leading slash : %s")" "$i"
@@ -1276,7 +1278,8 @@ check_sanity() {
done
local optdepends_list=()
- eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/")
+ eval $(awk '/^[[:space:]]*optdepends=\(/,/\)[[:space:]]*(|#.*)$/' "$BUILDFILE" | \
+ sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//")
for i in "${optdepends_list[@]}"; do
local pkg=${i%%:*}
if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then
@@ -1300,7 +1303,8 @@ check_sanity() {
local valid_options=1
local known kopt options_list
- eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | sed "s/options=/options_list+=/")
+ eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \
+ sed -e "s/options=/options_list+=/" -e "s/#.*//")
for i in ${options_list[@]}; do
known=0
# check if option matches a known option or its inverse