rocky-linux/rocky-tools
4
0
Fork 0
mirror of https://github.com/rocky-linux/rocky-tools.git synced 2024-11-24 22:21:24 +00:00
Code Issues Projects Releases Activity

Fix issue where we didn't exit when we were supposed to.

Browse Source 
Exiting from a subshell doesn't actually exit the script.  Move the exit to
outside of the subshell.
This commit is contained in:
Peter Ajamian 2022-02-11 14:46:51 +13:00
parent c8737c2302
commit f3fe6d768a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migrate2rocky/migrate2rocky.sh
View File

@ -357,11 +357,9 @@ bin_check() {
# as a special-case below to avoid having the extras repository map to epel. # as a special-case below to avoid having the extras repository map to epel.
repoquery () { repoquery () {
local name val prev result local name val prev result
result=$( result=$(safednf -y -q "${dist_repourl_swaps[@]}" \
safednf -y -q "${dist_repourl_swaps[@]}" \ --setopt=epel.excludepkgs=epel-release repoquery -i "$1") ||
--setopt=epel.excludepkgs=epel-release repoquery -i "$1" || exit_message "Failed to fetch info for package $1."
exit_message "Failed to fetch info for package $1."
)
if ! [[ $result ]]; then if ! [[ $result ]]; then
# We didn't match this package, the repo could be disabled. # We didn't match this package, the repo could be disabled.
return 1 return 1