srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-25 23:33:07 +00:00
Code Issues Releases Activity

Handle Software screen making a comeback in gnome-initial-setup

Browse Source 
It's back from the dead! In F35+, anyway.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-08-23 12:45:35 -07:00
parent 0ab4c40f9a
commit 5661d3c1a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils.pm
View File

@ -694,7 +694,7 @@ sub gnome_initial_setup {
timeout => 120, timeout => 120,
@_ @_
); );
my $version = lc(get_var("VERSION")); my $relnum = get_release_number;
# the pages we *may* need to click 'next' on. *NOTE*: 'language' # the pages we *may* need to click 'next' on. *NOTE*: 'language'
# is the 'welcome' page, and is in fact never truly skipped; if # is the 'welcome' page, and is in fact never truly skipped; if
# it's configured to be skipped, it just shows without the language # it's configured to be skipped, it just shows without the language
@ -713,6 +713,9 @@ sub gnome_initial_setup {
# except 'language' is never *really* skipped (see above) # except 'language' is never *really* skipped (see above)
@nexts = grep {$_ ne 'keyboard'} @nexts; @nexts = grep {$_ ne 'keyboard'} @nexts;
@nexts = grep {$_ ne 'timezone'} @nexts; @nexts = grep {$_ ne 'timezone'} @nexts;
# 'additional software sources' screen did not display on F28-F34:
# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/59
@nexts = grep {$_ ne 'software'} @nexts if ($relnum < 35);
} }
else { else {
# 'timezone' and 'software' are suppressed for the 'existing user' # 'timezone' and 'software' are suppressed for the 'existing user'
@ -720,9 +723,6 @@ sub gnome_initial_setup {
@nexts = grep {$_ ne 'software'} @nexts; @nexts = grep {$_ ne 'software'} @nexts;
@nexts = grep {$_ ne 'timezone'} @nexts; @nexts = grep {$_ ne 'timezone'} @nexts;
} }
# 'additional software sources' screen does not display on F28+:
# https://bugzilla.gnome.org/show_bug.cgi?id=794825
@nexts = grep {$_ ne 'software'} @nexts;
# note: in g-i-s 3.37.91 and later, the first screen in systemwide # note: in g-i-s 3.37.91 and later, the first screen in systemwide
# mode has a "Start Setup" button, not a "Next" button # mode has a "Start Setup" button, not a "Next" button