bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: Simplify SPLITPKG check

Browse source 
This causes package_$pkgname() to be preferred over package() in the
non-split case, but the behavior if both functions exist was
undocumented anyway.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jan Alexander Steffens (heftig) 2018-05-31 18:24:47 +02:00 • committed by Allan McRae
parent 0cbb128818
commit f2788244d3
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/makepkg.sh.in
View file

@ -1491,7 +1491,7 @@ fi
# check we have the software required to process the PKGBUILD # check we have the software required to process the PKGBUILD
check_software || exit $E_MISSING_MAKEPKG_DEPS check_software || exit $E_MISSING_MAKEPKG_DEPS
if (( ${#pkgname[@]} > 1 )); then if (( ${#pkgname[@]} > 1 )) || have_function package_${pkgname}; then
SPLITPKG=1 SPLITPKG=1
fi fi
@ -1513,8 +1513,6 @@ if have_function check; then
fi fi
if have_function package; then if have_function package; then
PKGFUNC=1 PKGFUNC=1
elif [[ $SPLITPKG -eq 0 ]] && have_function package_${pkgname}; then
SPLITPKG=1
fi fi
# check if gpg signature is to be created and if signing key is valid # check if gpg signature is to be created and if signing key is valid