Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opensuse_welcome: is applicable for Leap 15.2+ on xfce (poo#62597) #9539

Merged
merged 1 commit into from Feb 10, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/main_common.pm
Expand Up @@ -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 {
Expand Down