moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

makepkg: fix false error with multiple libdeps

Browse Source 
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>
This commit is contained in:
Florian Pritz 2012-03-04 19:23:25 +01:00 committed by Dan McGee
parent fbfcd86650
commit ea7fc8962a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/makepkg.sh.in
View File

@ -1152,7 +1152,8 @@ write_pkginfo() {
if [[ $it = *.so ]]; then if [[ $it = *.so ]]; then
# check if the entry has been found by find_libdepends # check if the entry has been found by find_libdepends
# if not, it's unneeded; tell the user so he can remove it # 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" error "$(gettext "Cannot find library listed in %s: %s")" "'depends'" "$it"
return 1 return 1
fi fi