summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-11-25 19:40:34 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-11-25 19:40:34 +0000
commit134b02fb46a9dff39fd085c98d701f2b2419aaa8 (patch)
tree474eab85ee5a62cb151ed9cc1c45adcd4692db99
parent9e0aa67687e9dbb772796531dd476c2a816d9d2c (diff)
downloaddrakx-134b02fb46a9dff39fd085c98d701f2b2419aaa8.tar
drakx-134b02fb46a9dff39fd085c98d701f2b2419aaa8.tar.gz
drakx-134b02fb46a9dff39fd085c98d701f2b2419aaa8.tar.bz2
drakx-134b02fb46a9dff39fd085c98d701f2b2419aaa8.tar.xz
drakx-134b02fb46a9dff39fd085c98d701f2b2419aaa8.zip
(real_main) once ISP DB is loaded, do not bother reload it
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 271e08d2e..74234c38e 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -549,7 +549,7 @@ Take a look at http://www.linmodems.org"),
$countries{$country} ||= translate($country);
join('', $countries{$country}, $_);
} grep { !/.directory$/ } glob_("$p_db_path/$country/*");
- } map { s!$p_db_path/!!o; s!_! !g; $_ } glob_("$p_db_path/*");
+ } map { s!$p_db_path/!!o; s!_! !g; $_ } glob_("$p_db_path/*") if !@isp;
$old_provider = $provider;
},
name => N("Select your provider:"),
@@ -695,7 +695,7 @@ Take a look at http://www.linmodems.org"),
{
pre => sub {
require network::adsl_consts;
- %adsl_data = %network::adsl_consts::adsl_data;
+ %adsl_data = %network::adsl_consts::adsl_data if is_empty_hash_ref(\%adsl_data);
$adsl_old_provider = $adsl_provider;
if (!$adsl_provider) {
require lang;