summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-05-20 13:34:39 +0000
committerThierry Vignaud <tv@mandriva.org>2008-05-20 13:34:39 +0000
commit12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053 (patch)
tree1d286a519d08a4efc6c74e852ae3a3d471fb73ad
parent71e0944728aae5e47138473147073c192ddfd25c (diff)
downloaddrakx-12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053.tar
drakx-12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053.tar.gz
drakx-12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053.tar.bz2
drakx-12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053.tar.xz
drakx-12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053.zip
(set_pulseaudio_routing) be more robust when managing
/etc/alsa/pulse-default.conf
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/sound.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index abb6da081..ed5f6505c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- draksound:
+ o be more robust when managing /etc/alsa/pulse-default.conf
- drakbug:
o automatically report CPU name & kernel version
o prefill the platform field
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 885e48d1f..41084a1c3 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -233,9 +233,9 @@ sub set_pulseaudio_routing {
my ($val) = @_;
substInFile {
if ($val) {
- s/^$disabling_routing//;
+ s/^(?:$disabling_routing)*//g;
} else {
- s/^/$disabling_routing/;
+ s/^/$disabling_routing/ if !/^$disabling_routing/;
}
} $alsa_routing_config_file;
}