FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 03-19-2011, 12:24 AM
Allan McRae
 
Default 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>
---
scripts/makepkg.sh.in | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 23081fe..bb7616c 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
--
1.7.4.1
 

Thread Tools




All times are GMT. The time now is 05:27 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org