From 9ffd181bbdb843c0080e7c483c96b708c0acfa91 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Feb 14 2024 23:19:46 +0000
Subject: Don't expect g-i-s online accounts page on F40+


It was removed upstream:
https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/221

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/lib/utils.pm b/lib/utils.pm
index fc7b916..d741045 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -920,12 +920,16 @@ sub gnome_initial_setup {
             wait_screen_change { assert_and_click ["next_button"]; };
         }
     }
-    unless (get_var("VNC_CLIENT") || $args{live}) {
+    unless (get_var("VNC_CLIENT") || $args{live} || $relnum > 39) {
         # We should be at the GOA screen, except on VNC_CLIENT case
         # where network isn't working yet. click 'Skip' one time. If
         # it's not visible we may have hit
         # https://bugzilla.redhat.com/show_bug.cgi?id=1997310 , which
         # we'll handle as a soft failure
+        # This screen was removed from g-i-s in Jan 2024:
+        # https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/221
+        # so we don't see it on F40+, and can drop this block when
+        # F39 is EOL
         mouse_set(100, 100);
         if (check_screen "skip_button", 60) {
             wait_screen_change { click_lastmatch; };