Merge pull request #9539 from ggardet/opensuse_welcome_screen_15.2

opensuse_welcome: is applicable for Leap 15.2+ on xfce (poo#62597)
os-autoinst · Feb 10, 2020 · 2071ab8 · 2071ab8
2 parents f386c10 + 777c365
commit 2071ab8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/main_common.pm b/lib/main_common.pm
@@ -211,11 +211,11 @@ sub any_desktop_is_applicable {
 }
 
 sub opensuse_welcome_applicable {
-    # openSUSE-welcome is expected to show up on openSUSE Tumbleweed only (Leap possibly in the future)
+    # openSUSE-welcome is expected to show up on openSUSE Tumbleweed and Leap 15.2+ XFCE only
     # since not all DEs honor xdg/autostart, we are filtering based on desktop environments
     # except for ppc64/ppc64le because not built libqt5-qtwebengine sr#323144
     my $desktop = shift // get_var('DESKTOP', '');
-    return $desktop =~ /gnome|kde|lxde|lxqt|mate|xfce/ && is_tumbleweed && (get_var('ARCH') !~ /ppc64/);
+    return (($desktop =~ /gnome|kde|lxde|lxqt|mate|xfce/ && is_tumbleweed) || ($desktop =~ /xfce/ && is_leap(">=15.2"))) && (get_var('ARCH') !~ /ppc64/);
 }
 
 sub logcurrentenv {