PR#7: Fix -b (branch) flag in show_possible_srpms.sh - centos-git-common

Fix {dist} macro regex to support EL9 RPMs with _ in {dist}

Paul Donohue • 4 months ago

3666df

Fix {dist} macro regex to support stream RPMs with + in {dist}

Paul Donohue • 2 years ago

49c77b

Fix AUTHOR used for `show_possible_srpms.sh -r`

Paul Donohue • 2 years ago

ba3d5e

Fix -b (branch) flag in show_possible_srpms.sh

Paul Donohue • 2 years ago

253cba

return_disttag.sh

file modified

+3 -3

		`@@ -124,15 +124,15 @@`
		`mydist="XXXjsdf9ur7qlkasdh4gygXXX"`
		`test_nvr=$(build_with_dist_scl "SPECS/${SPEC}" ${mydist})`

		`- test_nodist=$(echo ${test_nvr} \| sed -e 's/-[a-zA-Z0-9\.]*$//')`
		`- git_nodist=$(echo ${git_nvr} \| sed -e 's/-[a-zA-Z0-9\._]*$//')`
		`+ test_nodist=$(echo ${test_nvr} \| sed -e 's/-[a-zA-Z0-9.+_]*$//')`
		`+ git_nodist=$(echo ${git_nvr} \| sed -e 's/-[a-zA-Z0-9.+_]*$//')`

		`if [[ "${git_nodist}" != "${test_nodist}" ]]; then`
		`warn "Warning: ${git_nvr} != ${test_nvr}"`
		`warn "Warning: Trying as a Software Collection"`
		`scl=$(echo ${git_nodist} \|sed -e "s/-${test_nodist}//")`
		`test_nvr=$(build_with_dist_scl "SPECS/${SPEC}" ${mydist} ${scl})`
		`- test_nodist=$(echo ${test_nvr} \| sed -e 's/-[a-zA-Z0-9\.]*$//')`
		`+ test_nodist=$(echo ${test_nvr} \| sed -e 's/-[a-zA-Z0-9.+_]*$//')`
		`fi`

		`if [[ "${git_nodist}" != "${test_nodist}" ]]; then`

show_possible_srpms.sh

file modified

+16 -13

		`@@ -37,7 +37,8 @@`

		`#####################################################################`

		`- RHELAUTHOR="CentOS Buildsys <bugs@centos.org>"`
		`+ # regex that matches "CentOS Sources" or "CentOS Buildsys"`
		`+ RHELAUTHOR="CentOS $Sources\\|Buildsys$ <bugs@centos.org>"`

		`RHELONLY=0`
		`QUIET=0`
		`@@ -97,11 +98,7 @@`
		`exit 1`
		`fi`

		`- # commit message contains white space, set IFS to \n`
		`- IFS='`
		`- '`
		`-`
		`- LOGARGS="--pretty=%H\|\%s"`
		`+ LOGARGS="--pretty='%H\|%s'"`
		`if [[ ${RHELONLY} -eq 1 ]]; then`
		`LOGARGS="${LOGARGS} --author='${RHELAUTHOR}'"`
		`fi`
		`@@ -110,29 +107,35 @@`
		`LOGARGS="${LOGARGS} ${BRANCH}"`
		`fi`

		`- loglist=$(git log ${LOGARGS} \|grep import)`
		`+ loglist="$(eval "git log ${LOGARGS}" \| grep import)"`
		`if [[ $? -ne 0 ]]; then`
		`exit 1`
		`fi`

		`+ # split loglist on newline`
		`+ splitloglist()`
		`+ {`
		`+ local IFS=$'\n'`
		`+ loglist=($loglist)`
		`+ }`
		`+ splitloglist`
		`+`
		`# flag for if nothing is found`
		`FOUND=False`
		`- for entry in $loglist; do`
		`+ for entry in "${loglist[@]}"; do`
		`FOUND=True`

		`- pkg=$(echo ${entry} \| cut -d' ' -f2)`
		`+ pkg=$(echo "${entry}" \| cut -d' ' -f2)`
		`# strip .src.rpm if present`
		`nvr="${pkg%.src.rpm}"`
		`if [[ ${WITHCOMMITHASH} -eq 1 ]]; then`
		`- shasum=$(echo ${entry} \| cut -d'\|' -f1)`
		`+ shasum=$(echo "${entry}" \| cut -d'\|' -f1)`
		`echo "${shasum}:${nvr}.src.rpm"`
		`else`
		`echo "${nvr}.src.rpm"`
		`fi`
		`done`

		`- if [ "${FOUND}" != "True" ]`
		`- then`
		`+ if [ "${FOUND}" != "True" ]; then`
		`warn "No SRPMs found"`
		`fi`
		`-`