From f8a02ef07ace32552828778f63e2a3a3e4d05972 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 9 May 2025 00:42:41 -0700 Subject: [PATCH] upgrade_run: with dnf 5, --allowerasing has to be later Signed-off-by: Adam Williamson --- tests/upgrade_run.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index dc32bd9e..224bc88b 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -17,8 +17,11 @@ sub run { if (script_run "dnf ${params} system-upgrade download", 6000) { record_soft_failure "dnf failed so retry with --allowerasing"; - $params .= " --allowerasing"; - assert_script_run "dnf ${params} system-upgrade download", 6000; + if $relnum < 41 { + assert_script_run "dnf ${params} --allowerasing system-upgrade download", 6000; + } + else { + assert_script_run "dnf ${params} system-upgrade --allowerasing download", 6000; } upload_logs "/var/log/dnf.log", failok => 1;