mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-25 07:13:09 +00:00
Forcibly install dnf for FEDORA-2023-5fd964c1bf
Per https://bodhi.fedoraproject.org/updates/FEDORA-2023-5fd964c1bf#comment-3149533 we kinda need to do this to allow this update through, so long as we're not going to have dnf obsolete dnf5 or anything like that. It's a bit unfortunate but I don't see an alternative. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
ae7d5011df
commit
475b875bc0
@ -604,6 +604,11 @@ sub _repo_setup_updates {
|
|||||||
# already and we want to fail if they weren't, or CANNED
|
# already and we want to fail if they weren't, or CANNED
|
||||||
# tests, there's no point updating the toolbox
|
# tests, there's no point updating the toolbox
|
||||||
script_run "dnf -y update", 1200 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
|
script_run "dnf -y update", 1200 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
|
||||||
|
# work around update removing 'dnf' command for the dnf5
|
||||||
|
# revert: https://bodhi.fedoraproject.org/updates/FEDORA-2023-5fd964c1bf#comment-3149533
|
||||||
|
if (get_var("ADVISORY_OR_TASK") eq "FEDORA-2023-5fd964c1bf") {
|
||||||
|
script_run "dnf5 -y --best install 'dnf < 5'", 300 unless (get_var("UPGRADE") || get_var("INSTALL") || get_var("CANNED"));
|
||||||
|
}
|
||||||
# on liveinst tests, we'll remove the packages we installed
|
# on liveinst tests, we'll remove the packages we installed
|
||||||
# above (and their deps, which dnf will include automatically),
|
# above (and their deps, which dnf will include automatically),
|
||||||
# just in case they're in the update under test; otherwise we
|
# just in case they're in the update under test; otherwise we
|
||||||
|
Loading…
Reference in New Issue
Block a user