diff options
| author | Allan McRae <allan@archlinux.org> | 2011-09-24 14:53:20 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-26 16:02:19 -0500 |
| commit | 6adf502f0d0e684c67d7498057083958becf8b19 (patch) | |
| tree | 8ad1a8388968bed02b1c5b4139e44c603a52344c /scripts | |
| parent | d26d50e664665905d79a3d5fa589b2ca0bec4ba0 (diff) | |
| download | pacman-6adf502f0d0e684c67d7498057083958becf8b19.tar.xz | |
makepkg: allow versioned optdepends with epoch
Allow the specification of versioned optdepends with an epoch.
This also (partially) enforces a whitespace between ":" and the
description which is required for the future optdepends parsing
code.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6304a258..a0b03753 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1529,8 +1529,8 @@ check_sanity() { eval $(awk '/^[[:space:]]*optdepends=\(/,/\)[[:space:]]*(#.*)?$/' "$BUILDFILE" | \ sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//" -e 's/\\$//') for i in "${optdepends_list[@]}"; do - local pkg=${i%%:*} - if [[ $pkg != +([[:alnum:]><=.+_-]) ]]; then + local pkg=${i%%:[[:space:]]*} + if [[ $pkg != +([[:alnum:]><=.+_-:]) ]]; then error "$(gettext "Invalid syntax for %s : '%s'")" "optdepend" "$i" ret=1 fi |