From 9f05654d1ce14f4e1f00239b96a1ac5f6546b06a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 18 Feb 2003 09:32:59 +0000
Subject: just remove all DISPLAYMANAGER occurences and fix the case where
 there were no such line before (which probably had never caught anyone)

---
 perl-install/standalone/drakedm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/standalone/drakedm')

diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index d2c796fd3..2a76e31ef 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -50,8 +50,8 @@ several different X sessions on your local machine at the same time.")),
     my $done = 0;
     $new_dm = { reverse %dm }->{$new_dm};
     substInFile {
-        $done ||= s/^(DISPLAYMANAGER)=.*/$1=$new_dm/;
-        print "\nDISPLAYMANAGER=$dm{$dm}" if eof && !$done;
+        s/^(DISPLAYMANAGER)=.*(\n|)//;
+        print "\nDISPLAYMANAGER=$new_dm" if eof;
     } $cfg_file;
 }
 
-- 
cgit v1.2.1