summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-10-12 12:40:54 +0000
committerThierry Vignaud <tv@mandriva.org>2009-10-12 12:40:54 +0000
commit60758a3428a7e54d5b8528583277103eff75bde1 (patch)
tree8c32f439ea7d990cdc186f0fcecee00aa010b3a0
parent9d9eba3d3d510cea40d65cfdd1af1ad71fd26743 (diff)
downloaddrakx-60758a3428a7e54d5b8528583277103eff75bde1.tar
drakx-60758a3428a7e54d5b8528583277103eff75bde1.tar.gz
drakx-60758a3428a7e54d5b8528583277103eff75bde1.tar.bz2
drakx-60758a3428a7e54d5b8528583277103eff75bde1.tar.xz
drakx-60758a3428a7e54d5b8528583277103eff75bde1.zip
(add_device_wizard) fix crash due to functions moved from
drakx-kbd-mouse-x11 into detect_devices (#54399) in r258256 by cfergeauon 2009-07-01
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/drakups4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c2e1f92bf..6793ee9b6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- partitioning wizard:
o put back "previous" button on actions (#54475)
+- drakups
+ o fix crash (#54399)
Version 12.63 - 9 October 2009
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index b350bb922..a52384e67 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -142,8 +142,8 @@ Please fill in its name, its driver and its port.", $model, $vendor);
[
{ label => N("Name:"), val => \$name, help => N("The name of your ups") },
{ label => N("Driver:"), val => \$driver, help => N("The driver that manages your ups") },
- { label => N("Port:"), val => \$port, format => \&mouse::serial_port2text, type => "combo",
- list => [ &mouse::serial_ports() ], not_edit => 0,
+ { label => N("Port:"), val => \$port, format => \&detect_devices::serialPort2text, type => "combo",
+ list => [ &detect_devices::serialPorts() ], not_edit => 0,
help => N("The port on which is connected your ups") },
];
},