summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-02-18 09:32:59 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-02-18 09:32:59 +0000
commit9f05654d1ce14f4e1f00239b96a1ac5f6546b06a (patch)
tree3b1b41d1255cabc26b26ab33879539b6169f7d5b
parent280f834961b4c3a791324aecc2470d17a4a45313 (diff)
downloaddrakx-9f05654d1ce14f4e1f00239b96a1ac5f6546b06a.tar
drakx-9f05654d1ce14f4e1f00239b96a1ac5f6546b06a.tar.gz
drakx-9f05654d1ce14f4e1f00239b96a1ac5f6546b06a.tar.bz2
drakx-9f05654d1ce14f4e1f00239b96a1ac5f6546b06a.tar.xz
drakx-9f05654d1ce14f4e1f00239b96a1ac5f6546b06a.zip
just remove all DISPLAYMANAGER occurences and fix the case where there
were no such line before (which probably had never caught anyone)
-rw-r--r--perl-install/standalone/drakedm4
1 files changed, 2 insertions, 2 deletions
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;
}