Work around RHBZ#1625572 (both g-i-s modes running)

RHBZ#1625572 is for gnome-initial-setup running in 'first login'
mode after it's already run in 'user creation' mode (which isn't
meant to happen). This works around that so the subsequent tests
can run. We don't soft-fail because meh.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-09-06 17:59:40 -07:00
parent c62a04bac8
commit e3887c5a83
1 changed files with 7 additions and 1 deletions

View File

@ -60,7 +60,13 @@ sub run {
# as this test gets loaded twice on the ADVISORY flow, and
# we might be on the INSTALL_NO_USER flow, check whether
# this happened already
unless (get_var("_setup_done")) {
# FIXME 2018-09: #1625572 means g-i-s 'first login' mode runs
# after 'user creation' mode on F29 and Rawhide install tests,
# even though it shouldn't. Go back to the simpler line
# commented below when that bug is fixed
# unless (get_var("_setup_done")) {
my $version = get_var("VERSION");
if (!get_var("_setup_done") || (($version > 28 || $version eq "Rawhide") && get_var("INSTALL_NO_USER"))) {
gnome_initial_setup();
}
}