From e56a92884ebad8ce742393425d254a299c4bcd74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= Date: Fri, 31 Mar 2023 19:06:13 +0200 Subject: Add more checking for pipewire and pulseaudio package overlapping --- perl-install/harddrake/sound.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/harddrake') diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 7801bf8c8..ec4823372 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -494,13 +494,13 @@ sub config { }; - my $warn_both = ($in->do_pkgs->is_installed('pipewire') && $in->do_pkgs->is_installed('pulseaudio')) ? - N("WARNING both pulseaudio and pipewire are installed, please fix configuration applying your choice") : + my $warn_both = ($in->do_pkgs->is_installed('pipewire') && $in->do_pkgs->is_installed('pulseaudio') && (-e $::prefix . '/etc/systemd/user/sockets.target.wants/pipewire.socket' || -e $::prefix . '/etc/systemd/user/sockets.target.wants/pipewire.service')) ? + N("Warning: both pulseaudio and pipewire are installed and can conflict each other. Please fix your config by applying a choice") : ""; my $is_pipewire_available = $in->do_pkgs->is_available('task-pipewire'); my $warn_pipewire_unavailable = (not $is_pipewire_available) ? - N("Warning: task-pipewire is not available on any media sources, so pipewire cannot be set up. Plese fix your repo configuration.") : + N("Warning: task-pipewire is not available in any media sources, so only pulseaudio could be set up. Please fix your repo configuration.") : ""; my @service_list = ( -- cgit v1.2.1