index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-09 13:41:12 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2019-01-10 17:00:03 +1000 |
commit | f7efa6a93d5361af610827d41045d87c7a72f2b5 (patch) | |
tree | 1d3d0bb731e5af544fa732b342fb95adecaee67e /scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | |
parent | 30e3e21e873b01b98ab91dc1252d4112d6a9fd2a (diff) |
-rw-r--r-- | scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 10 |
diff --git a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in index 9978fe9b..505ee848 100644 --- a/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in @@ -23,6 +23,8 @@ LIBMAKEPKG_LINT_PKGBUILD_OPTDEPENDS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} +source "$LIBRARY/lint_pkgbuild/fullpkgver.sh" +source "$LIBRARY/lint_pkgbuild/pkgname.sh" source "$LIBRARY/util/message.sh" source "$LIBRARY/util/pkgbuild.sh" @@ -41,12 +43,10 @@ lint_optdepends() { for optdepend in "${optdepends_list[@]%%:[[:space:]]*}"; do name=${optdepend%%@(<|>|=|>=|<=)*} - # remove optional epoch in version specifier - ver=${optdepend##$name@(<|>|=|>=|<=)?(+([0-9]):)} lint_one_pkgname optdepends "$name" || ret=1 - if [[ $ver != $optdepend ]]; then - # remove optional pkgrel in version specifier - check_pkgver "${ver%-+([0-9])?(.+([0-9]))}" optdepends || ret=1 + if [[ $name != $optdepend ]]; then + ver=${optdepend##$name@(<|>|=|>=|<=)} + check_fullpkgver "$ver" optdepends || ret=1 fi done |