From 0ed15a87cabf68fbe163f23c4e4b9aa979097c7d Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Fri, 23 Mar 2001 15:40:13 +0000
Subject: added /dev/modem in modem list selection

---
 perl-install/any.pm   | 3 ++-
 perl-install/mouse.pm | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index d015e5897..543ea7e0f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -407,7 +407,8 @@ sub pppConfig {
     my ($in, $modem, $prefix, $install) = @_;
     $modem or return;
 
-    symlinkf($modem->{device}, "$prefix/dev/modem") or log::l("creation of $prefix/dev/modem failed");
+    if_($modem->{device} ne "$prefix/dev/modem",
+	symlinkf($modem->{device}, "$prefix/dev/modem") or log::l("creation of $prefix/dev/modem failed"));
     $install->(qw(ppp)) unless $::testing;
 
     my %toreplace;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index bc7a9e565..815d64f7c 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -143,8 +143,7 @@ sub fullname2mouse {
 
 sub serial_ports() { map { "ttyS$_" } 0..7 }
 sub serial_port2text {
-    $_[0] =~ /ttyS (\d+)/x;
-    "$_[0] / COM" . ($1 + 1);
+    $_[0] =~ /ttyS (\d+)/x ? "$_[0] / COM" . ($1 + 1) : $_[0];
 }
 
 sub read {
-- 
cgit v1.2.1