diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-25 21:56:11 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-25 21:56:11 +0000 |
commit | 404e04a2987baceaac76c4d940eeb43cfca942f8 (patch) | |
tree | cd5226447e14271e0a5d4e3097a15562cd89dc32 | |
parent | c357f452bcc14500e91b864d08e55c288c79e449 (diff) | |
download | drakx-404e04a2987baceaac76c4d940eeb43cfca942f8.tar drakx-404e04a2987baceaac76c4d940eeb43cfca942f8.tar.gz drakx-404e04a2987baceaac76c4d940eeb43cfca942f8.tar.bz2 drakx-404e04a2987baceaac76c4d940eeb43cfca942f8.tar.xz drakx-404e04a2987baceaac76c4d940eeb43cfca942f8.zip |
- $up was my-ed inside the if-then block though it was used outside the block (hint: buggy code)
- my @country as it should be
-rw-r--r-- | perl-install/network/tools.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 53dc1b5ff..07d8e5d6e 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -3,7 +3,7 @@ package network::tools; use common; use run_program; use c; -use vars qw(@ISA @EXPORT); +use vars qw(@ISA @EXPORT @EXPORT_OK); use MDK::Common::Globals "network", qw($in $prefix $disconnect_file $connect_prog $connect_file); use MDK::Common::System qw(getVarsFromSh); @@ -37,11 +37,11 @@ sub write_secret_backend { sub ask_connect_now { my ($type) = @_; $::Wizard_no_previous = 1; + my $up; #- FIXME : code the exception to be generated by ask_yesorno, to be able to remove the $::Wizard_no_previous=1; if ($in->ask_yesorno(N("Internet configuration"), N("Do you want to try to connect to the Internet now?") )) { - my $up; { my $w = $in->wait_message('', N("Testing your connection..."), 1); connect_backend(); @@ -118,6 +118,7 @@ sub detect_timezone { 'Europe/London' => N("United Kingdom") ); my %tm_parse = MDK::Common::System::getVarsFromSh('/etc/sysconfig/clock'); + my @country; foreach (keys %tmz2country) { if ($_ eq $tm_parse{ZONE}) { unshift @country, $tmz2country{$_}; |