diff options
| author | Max Rees <maxcrees@me.com> | 2020-05-01 01:54:58 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-05-01 01:54:58 -0500 |
| commit | 8ed2280a36147112c0feec10487659fe4791493d (patch) | |
| tree | 702ce0677f0a6ab2b7183de059bb8f4679f1fa41 | |
| parent | 534052fa6c65aae637324c9691a1afe8fad29c15 (diff) | |
| download | abuild-8ed2280a36147112c0feec10487659fe4791493d.tar.gz abuild-8ed2280a36147112c0feec10487659fe4791493d.tar.bz2 abuild-8ed2280a36147112c0feec10487659fe4791493d.tar.xz abuild-8ed2280a36147112c0feec10487659fe4791493d.zip | |
checkapk: align -dbg with what abuild does
| -rw-r--r-- | checkapk.in | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/checkapk.in b/checkapk.in index d58d464..0150568 100644 --- a/checkapk.in +++ b/checkapk.in @@ -26,6 +26,15 @@ if command -v abipkgdiff >/dev/null 2>&1; then abigail=1 fi +subpackage_types_has() { + local i + for i in $subpackages; do + local _name="${i%%:*}" + [ "$1" = "${_name##*-}" ] && return 0 + done + return 1 +} + list_has() { local needle="$1" local i @@ -122,9 +131,9 @@ abigail_pre() { [ -n "$abigail" ] || return 0 # This assumes one of each, which should generally be the case. - list_has "!dbg" $options || dbg2="$pkgname-dbg" for i in $subpackages; do case "$i" in + *-dbg) dbg2="$i";; *-dev) dev2="$i";; esac done @@ -238,6 +247,12 @@ if ! [ -n "$CARCH" ]; then fi . ./APKBUILD +if [ -n "$DEFAULT_DBG" ] \ + && ! subpackage_types_has "dbg" \ + && ! list_has "!dbg" $options \ + && [ "$arch" != "noarch" ]; then + subpackages="$pkgname-dbg $subpackages" +fi startdir="$PWD" repodir="${startdir%/*}" |