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

dnf should always assume yes (#102)

Browse Source 
There are cases where dnf might wait for confirmation, sometimes for a missing
key, etc, that one would not expect.  By always passing "-y" we ensure this
isn't an issue.
This commit is contained in:
Peter Ajamian 2021-08-15 20:39:26 +12:00 committed by GitHub
parent 142ce12645
commit d7e4c072a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migrate2rocky/migrate2rocky.sh
View File

@ -270,7 +270,7 @@ bin_check() {
repoquery () { repoquery () {
local name val prev result local name val prev result
result=$( result=$(
dnf -q --setopt=epel.excludepkgs=epel-release repoquery -i "$1" || dnf -y -q --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
@ -292,7 +292,7 @@ repoquery () {
# info for the resulting repository. # info for the resulting repository.
repoinfo () { repoinfo () {
local name val result local name val result
result=$(dnf -q repoinfo "$1") || result=$(dnf -y -q repoinfo "$1") ||
exit_message "Failed to fetch info for repository $1." exit_message "Failed to fetch info for repository $1."
if [[ $result == 'Total packages: 0' ]]; then if [[ $result == 'Total packages: 0' ]]; then
# We didn't match this repo. # We didn't match this repo.
@ -346,11 +346,11 @@ provides_pkg () (
fi fi
set -o pipefail set -o pipefail
provides=$(dnf -q provides "$1" | awk '{print $1; nextfile}') || provides=$(dnf -y -q provides "$1" | awk '{print $1; nextfile}') ||
return 1 return 1
set +o pipefail set +o pipefail
pkg=$(rpm -q --queryformat '%{NAME}\n' "$provides") || pkg=$(rpm -q --queryformat '%{NAME}\n' "$provides") ||
pkg=$(dnf -q repoquery --queryformat '%{NAME}\n' "$provides") || pkg=$(dnf -y -q repoquery --queryformat '%{NAME}\n' "$provides") ||
exit_message "Can't get package name for $provides." exit_message "Can't get package name for $provides."
printf '%s\n' "$pkg" printf '%s\n' "$pkg"
) )
@ -627,7 +627,7 @@ $'because continuing with the migration could cause further damage to system.'
# Get a list of system enabled modules. # Get a list of system enabled modules.
readarray -t enabled_modules < <( readarray -t enabled_modules < <(
set -e -o pipefail set -e -o pipefail
safednf -q "${repo_map[@]/#/--repo=}" module list --enabled | safednf -y -q "${repo_map[@]/#/--repo=}" module list --enabled |
awk ' awk '
$1 == "@modulefailsafe", /^$/ {next} $1 == "@modulefailsafe", /^$/ {next}
$1 == "Name", /^$/ {if ($1!="Name" && !/^$/) print $1":"$2} $1 == "Name", /^$/ {if ($1!="Name" && !/^$/) print $1":"$2}
@ -856,7 +856,7 @@ EOF
if (( ${#managed_repos[@]} )); then if (( ${#managed_repos[@]} )); then
# Filter the managed repos for ones still in the system. # Filter the managed repos for ones still in the system.
readarray -t managed_repos < <( readarray -t managed_repos < <(
safednf -q repolist "${managed_repos[@]}" | safednf -y -q repolist "${managed_repos[@]}" |
awk '$1!="repo" {print $1}' awk '$1!="repo" {print $1}'
) )