From 7379f7636d3527aad20e8c1e059d7c4a74d65f2b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sun, 18 Aug 2024 16:23:13 -0700 Subject: [PATCH] More updates for webUI deferral to F42 Signed-off-by: Adam Williamson --- lib/utils.pm | 4 ++-- tests/desktop_notifications.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 5f50512c..182be559 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -867,11 +867,11 @@ sub gnome_initial_setup { } if ($args{prelogin}) { # 'language', 'keyboard' and 'timezone' were skipped between F28 - # and F39 in the 'new user' mode by + # and F42 in the 'new user' mode by # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 , # except 'language' was never *really* skipped (see above) - if ($relnum < 41) { + if ($relnum < 42) { @nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts; } diff --git a/tests/desktop_notifications.pm b/tests/desktop_notifications.pm index 53e36497..47bca580 100644 --- a/tests/desktop_notifications.pm +++ b/tests/desktop_notifications.pm @@ -91,7 +91,7 @@ sub run { type_very_safely get_var("USER_PASSWORD", "weakpassword"); send_key 'ret'; } - elsif ($desktop eq 'gnome' && $relnum > 40) { + elsif ($desktop eq 'gnome' && $relnum > 41) { # with https://fedoraproject.org/wiki/Changes/AnacondaWebUIforFedoraWorkstation # we get a short g-i-s flow on live boot then the welcome tour gnome_initial_setup(live => 1, livetry => 1);