diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | gurpmi2 | 2 | ||||
| -rw-r--r-- | urpm/main_loop.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,7 @@ - fix testsuite - library: o enhanced doc + o internal cleanup (needs new drakx/rpmdrake) - security: o downgrade missing medium key check question to a warning for virtual media without keys when using urpmi --use-distrib @@ -331,7 +331,7 @@ sub do_install_3 () { sync(); }; - my $exit_code = urpm::main_loop::run($urpm, $state, scalar(@gurpmi::names), \@ask_unselect, \%requested, { + my $exit_code = urpm::main_loop::run($urpm, $state, scalar(@gurpmi::names), \@ask_unselect, { bad_signature => sub { my ($msg, $msg2) = @_; $urpm->{log}("$msg\n$msg2"); diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index 52525da1..bd6e9e9b 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -349,7 +349,7 @@ Warning: locking is left to callers... sub run { - my ($urpm, $state, $something_was_to_be_done, $ask_unselect, $_requested, $callbacks) = @_; + my ($urpm, $state, $something_was_to_be_done, $ask_unselect, $callbacks) = @_; #- global boolean options ($auto_select, $no_install, $install_src, $clean, $noclean, $force, $parallel, $test) = @@ -633,7 +633,7 @@ if (!$urpm->{options}{auto} && $ask_user && $urpm->{nb_install} || $env && !$opt my $exit_code = urpm::main_loop::run($urpm, $state, int(@names || @src_names || @files || @src_files), - \@ask_unselect, \%requested, { + \@ask_unselect, { (!$urpm->{options}{auto} || $allow_medium_change ? (copy_removable => sub { my $msg = N("Please insert the medium named \"%s\"", $_[0]); if (eval { require Hal::Cdroms; 1 }) { |