diff options
| author | Dan McGee <dan@archlinux.org> | 2011-03-20 11:49:42 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-20 11:49:42 -0500 |
| commit | b2fde01c545286bb92f6194603817602bf9dfbe7 (patch) | |
| tree | 283d93f361b09fa5479bc28db6e649e3732884f7 /scripts/makepkg.sh.in | |
| parent | 524b3389746f3ea44042050ba28b975b65e931ad (diff) | |
| parent | 67c0e9cab39a536f1ca2fbf2a35fe898e3b71ef4 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | 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 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 |