From b1c429a644e553fa2534b5910fcfca1c9d5673a9 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 10 Sep 2007 16:21:56 +0000 Subject: implement default choice for range (previous tentative was not very good. i don't know in which case $input is undef) --- urpm/msg.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'urpm') diff --git a/urpm/msg.pm b/urpm/msg.pm index daa1c55e..95938516 100644 --- a/urpm/msg.pm +++ b/urpm/msg.pm @@ -106,13 +106,13 @@ sub _message_input { return $o_default_input; } $input = ; - defined $input or return $o_opts{default}; + defined $input or return undef; chomp $input; $urpm::args::options{bug} and bug_log($input); if ($o_opts{boolean}) { $input =~ /^[$noexpr$yesexpr]?$/ and last; } elsif ($o_opts{range}) { - $input eq "" and $input = 1; #- defaults to first choice + $input eq "" and $input = $o_opts{default}; #- defaults to first choice (defined $o_opts{range_min} ? $o_opts{range_min} : 1) <= $input && $input <= $o_opts{range} and last; } else { last; -- cgit v1.2.1