Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-06-21 12:39:21 -0400
committerAllan McRae <allan@archlinux.org>2018-09-19 11:10:04 +1000
commit3d5a056452fe897e533edfac2ddbe2d1ca702a6e (patch)
treeba116e135a28bd37ad8ebeb4e34c9734e032807f /scripts
parent961ef1a4c8cfc0fa7b8da4e6cb77d8327934e32f (diff)
makepkg: reject PKGBUILDs with both split and non-split package functions
We accept package_foo() in non-split packages, because it's easier to switch to/from a split package just by removing a pkgname element. But it makes no sense to have both in one PKGBUILD. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/package_function.sh.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in
index e52f1325..1b973c3f 100644
--- a/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in
+++ b/scripts/libmakepkg/lint_pkgbuild/package_function.sh.in
@@ -34,11 +34,18 @@ lint_package_function() {
local i ret=0
if (( ${#pkgname[@]} == 1 )); then
- if have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then
+ if have_function 'package' && have_function "package_$pkgname"; then
+ error "$(gettext "Conflicting %s and %s functions in %s")" "package()" "package_$pkgname()" "$BUILDFILE"
+ ret=1
+ elif have_function 'build' && ! { have_function 'package' || have_function "package_$pkgname"; }; then
error "$(gettext "Missing %s function in %s")" "package()" "$BUILDFILE"
ret=1
fi
else
+ if have_function "package"; then
+ error "$(gettext "Extra %s function for split package '%s'")" "package()" "$pkgbase"
+ ret=1
+ fi
for i in "${pkgname[@]}"; do
if ! have_function "package_$i"; then
error "$(gettext "Missing %s function for split package '%s'")" "package_$i()" "$i"