summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2003-06-12 16:59:58 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2003-06-12 16:59:58 +0000
commit4239b13f2b4f972c37141f90a5495e70d454e4fc (patch)
treeb443d2166920dbf5e41c1af98a7d723dcae41969 /perl-install
parent3490afb451c27b7294b3977a7c9a98a7e2781940 (diff)
downloaddrakx-backup-do-not-use-4239b13f2b4f972c37141f90a5495e70d454e4fc.tar
drakx-backup-do-not-use-4239b13f2b4f972c37141f90a5495e70d454e4fc.tar.gz
drakx-backup-do-not-use-4239b13f2b4f972c37141f90a5495e70d454e4fc.tar.bz2
drakx-backup-do-not-use-4239b13f2b4f972c37141f90a5495e70d454e4fc.tar.xz
drakx-backup-do-not-use-4239b13f2b4f972c37141f90a5495e70d454e4fc.zip
- miscellaneous_choose() no longer use uneeded b_clicked
- drop $::Expert - perl_checker fix
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/network.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index b89cb3a9e..fadcea6b4 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -387,11 +387,11 @@ notation (for example, 1.2.3.4).");
return 0 if !$intf->{WIRELESS_FREQ};
if ($intf->{WIRELESS_FREQ} !~ /[0-9.]*[kGM]/) {
$in->ask_warn('', N("Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."));
- return (1,6);
+ return 1,6;
}
if ($intf->{WIRELESS_RATE} !~ /[0-9.]*[kGM]/) {
$in->ask_warn('', N("Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."));
- return (1,8);
+ return 1,8;
}
},
focus_out => sub {
@@ -447,7 +447,7 @@ want to use the default host name."),
}
sub miscellaneous_choose {
- my ($in, $u, $b_clicked) = @_;
+ my ($in, $u) = @_;
$in->ask_from('',
N("Proxies configuration"),
@@ -459,7 +459,7 @@ sub miscellaneous_choose {
$u->{ftp_proxy} =~ m,^($|ftp://|http://), or $in->ask_warn('', N("URL should begin with 'ftp:' or 'http:'")), return 1,1;
0;
}
- ) or return if $::expert || $b_clicked;
+ ) or return;
1;
}