summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-03-04 19:23:25 +0100
committerDan McGee <dan@archlinux.org>2012-03-05 11:44:34 -0600
commitea7fc8962a819a04237876995140363a818202d4 (patch)
treeedcb1a1ea789ad7216733c7dbb2ccf00baed949c
parentfbfcd8665086f71b65370e919105194111b4b5f1 (diff)
downloadpacman-ea7fc8962a819a04237876995140363a818202d4.tar.xz
makepkg: fix false error with multiple libdeps
With multiple items in $libdepends this check only worked for the first one, everything after this returned an error. This was probably an issue with \s being treated wrong. Fix-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--scripts/makepkg.sh.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 21cbfab8..7c86b77f 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1152,7 +1152,8 @@ write_pkginfo() {
if [[ $it = *.so ]]; then
# check if the entry has been found by find_libdepends
# if not, it's unneeded; tell the user so he can remove it
- if [[ ! $libdepends =~ (^|\s)${it}=.* ]]; then
+ printf -v re '(^|\s)%s=.*' "$it"
+ if [[ ! $libdepends =~ $re ]]; then
error "$(gettext "Cannot find library listed in %s: %s")" "'depends'" "$it"
return 1
fi