summaryrefslogtreecommitdiffstats
path: root/lib/network/netconnect.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-18 19:18:32 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-18 19:18:32 +0000
commit3164a4636444b6c93716837abba868aefccc4a7b (patch)
tree1d44273baba729b4485a660733330ffaa53a7a6e /lib/network/netconnect.pm
parent98b351b053aaec48a022114b594fdac1caaaf481 (diff)
downloaddrakx-net-3164a4636444b6c93716837abba868aefccc4a7b.tar
drakx-net-3164a4636444b6c93716837abba868aefccc4a7b.tar.gz
drakx-net-3164a4636444b6c93716837abba868aefccc4a7b.tar.bz2
drakx-net-3164a4636444b6c93716837abba868aefccc4a7b.tar.xz
drakx-net-3164a4636444b6c93716837abba868aefccc4a7b.zip
split configure_hardware out of check_hardware (for check_hardware to only probe hardware status in next commits)
Diffstat (limited to 'lib/network/netconnect.pm')
-rw-r--r--lib/network/netconnect.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm
index 36ab362..f35abd0 100644
--- a/lib/network/netconnect.pm
+++ b/lib/network/netconnect.pm
@@ -180,9 +180,10 @@ sub real_main {
$in->ask_warn('', $connection->{hardware}{error});
return 1;
}
- if ($connection->can('check_hardware')) {
+ return 0 if !$connection->can('check_hardware') || $connection->check_hardware;
+ if ($connection->can('configure_hardware')) {
my $_w = $in->wait_message(N("Please wait"), N("Configuring device..."));
- if (!$connection->check_hardware) {
+ if (!$connection->configure_hardware) {
$in->ask_warn(N("Error"), $connection->{hardware}{error}) if $connection->{hardware}{error};
return 1;
}