summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Ghibò <ghibo@mageia.org>2023-03-31 19:06:13 +0200
committerGiuseppe Ghibò <ghibo@mageia.org>2023-04-08 12:39:08 +0200
commite56a92884ebad8ce742393425d254a299c4bcd74 (patch)
tree50626c0b7e88230423da7d923ffbd04cbdee68c9
parent0413c64502c126e66d9b230137f58af1f97806ff (diff)
downloaddrakx-e56a92884ebad8ce742393425d254a299c4bcd74.tar
drakx-e56a92884ebad8ce742393425d254a299c4bcd74.tar.gz
drakx-e56a92884ebad8ce742393425d254a299c4bcd74.tar.bz2
drakx-e56a92884ebad8ce742393425d254a299c4bcd74.tar.xz
drakx-e56a92884ebad8ce742393425d254a299c4bcd74.zip
Add more checking for pipewire and pulseaudio package overlapping
-rw-r--r--perl-install/harddrake/sound.pm6
1 files changed, 3 insertions, 3 deletions
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 = (