3
0
forked from pool/build-compare

Remove usage of associative array variables to support bash3

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=276
This commit is contained in:
Olaf Hering 2020-05-29 16:52:29 +00:00 committed by Git OBS Bridge
parent 512e57198a
commit 8908bc34d3
2 changed files with 14 additions and 11 deletions

View File

@ -21,7 +21,7 @@ Summary: Build Result Compare Script
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://github.com/openSUSE/build-compare Url: https://github.com/openSUSE/build-compare
Version: 20200529T104401.01cca87 Version: 20200529T185052.7a95d20
Release: 0 Release: 0
Source1: COPYING Source1: COPYING
Source2: same-build-result.sh Source2: same-build-result.sh

View File

@ -10,13 +10,16 @@
RPM="rpm -qp --nodigest --nosignature" RPM="rpm -qp --nodigest --nosignature"
declare -A rpm_querytags declare -a rpm_querytags
collect_rpm_querytags() { collect_rpm_querytags() {
while read rpm_querytags=( $(rpm --querytags) )
do }
: ${REPLY} # returns 0 if tag is known, returns 1 if unknown
rpm_querytags[${REPLY}]=Y rpmtag_known() {
done < <(rpm --querytags) local needle="\<${1}\>"
local haystack="${rpm_querytags[@]}"
[[ "${haystack}" =~ ${needle} ]]
return $?
} }
set_rpm_meta_global_variables() { set_rpm_meta_global_variables() {
@ -54,8 +57,8 @@ do
list=() list=()
for v in "${variant[@]}" for v in "${variant[@]}"
do do
qt=${t}${v} qt="${t}${v}"
test -n "${rpm_querytags[${qt}]}" || continue rpmtag_known "${qt}" || continue
list+=("%{${qt}}") list+=("%{${qt}}")
done done
QF_PROVIDES+="${t}\\n[${list[@]}\\n]\\n" QF_PROVIDES+="${t}\\n[${list[@]}\\n]\\n"
@ -99,8 +102,8 @@ do
list=() list=()
for v in "${variant[@]}" for v in "${variant[@]}"
do do
qt=${t}${v} qt="${t}${v}"
test -n "${rpm_querytags[${qt}]}" || continue rpmtag_known "${qt}" || continue
list+=("%{${qt}}") list+=("%{${qt}}")
done done
QF_SCRIPT+="${t}\\n[${list[@]}\\n]\\n" QF_SCRIPT+="${t}\\n[${list[@]}\\n]\\n"