From 12dc62f22d89b4bb1e77a5c43b2d2c0e1c921053 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 20 May 2008 13:34:39 +0000
Subject: (set_pulseaudio_routing) be more robust when managing
 /etc/alsa/pulse-default.conf

---
 perl-install/NEWS               | 2 ++
 perl-install/harddrake/sound.pm | 4 ++--
 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;
 }
-- 
cgit v1.2.1