From 1dd4382ea11428d32c36c099d65b1ba46d946764 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 2 May 2019 15:36:42 -0300 Subject: [PATCH] abuild.in: make is_x_package functions reliant on being given a name --- abuild.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abuild.in b/abuild.in index 8b9e810..08fce58 100644 --- a/abuild.in +++ b/abuild.in @@ -1114,7 +1114,7 @@ dir_has_arch_binaries() { # returns true if this is the -dev package is_dev_pkg() { - test "${subpkgname%-dev}" != "$subpkgname" + test "${1%-dev}" != "$1" } # returns true if this is the -static package @@ -1139,7 +1139,7 @@ archcheck() { [ "${subpkgarch:-$pkgarch}" != "noarch" ] && return 0 error "Arch specific binaries found so arch must not be set to \"noarch\"" return 1 - elif [ "${subpkgarch:-$pkgarch}" != "noarch" ] && ! is_dev_pkg && ! is_static_pkg "$subpkgname"; then + elif [ "${subpkgarch:-$pkgarch}" != "noarch" ] && ! is_dev_pkg "$subpkgname" && ! is_static_pkg "$subpkgname"; then # we dont want -dev package go to noarch warning "No arch specific binaries found so arch should probably be set to \"noarch\"" fi