From 777c365d2cd142a43be267b691facff05d2c3449 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Mon, 10 Feb 2020 12:27:37 +0100 Subject: [PATCH] opensuse_welcome: is applicable for Leap 15.2+ on xfce (poo#62597) --- lib/main_common.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/main_common.pm b/lib/main_common.pm index 1411f332124b..5872553a0b88 100644 --- 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 {