diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/install.pm | 10 | ||||
| -rwxr-xr-x | urpm/main_loop.pm | 1 |
3 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,5 @@ +- urpmi + o fix --quiet (regression introduced in 4.9.28) - all tools o new option --wait-lock (#13025) diff --git a/urpm/install.pm b/urpm/install.pm index 5f960b0d..b758923c 100644 --- a/urpm/install.pm +++ b/urpm/install.pm @@ -127,9 +127,9 @@ sub get_README_files { #- install packages according to each hash (remove, install or upgrade). #- options: #- test, excludepath, nodeps, noorder (unused), delta, -#- callback_inst, callback_trans, post_clean_cache +#- callback_inst, callback_trans, post_clean_cache, verbose #- (more options for trans->run) -#- excludedocs, nosize, noscripts, oldpackage, repackage, ignorearch +#- excludedocs, nosize, noscripts, oldpackage, repackage, replacepkgs, ignorearch sub install { my ($urpm, $remove, $install, $upgrade, %options) = @_; $options{translate_message} = 1; @@ -204,12 +204,12 @@ sub install { if (member($name, @previous)) { $urpm->{log}("removing upgraded package $fullname"); } else { - print N("removing package %s", $fullname), "\n" if $::verbose >= 0; + print N("removing package %s", $fullname), "\n" if $options{verbose} >= 0; } $index++; } }; - if ($::verbose >= 0 && (scalar keys %$install || scalar keys %$upgrade)) { + if ($options{verbose} >= 0 && (scalar keys %$install || scalar keys %$upgrade)) { $options{callback_inst} ||= \&install_logger; $options{callback_trans} ||= \&install_logger; } @@ -223,7 +223,7 @@ sub install { unlink "$urpm->{cachedir}/rpms/$_" foreach @pkgs; } - if ($::verbose >= 0) { + if ($options{verbose} >= 0) { foreach (keys %{$urpm->{readmes}}) { print "-" x 70, "\n", N("More information on package %s", $urpm->{readmes}{$_}), "\n"; print cat_(($urpm->{root} || '') . $_); diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index b8716801..5952466a 100755 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -155,6 +155,7 @@ foreach my $set (@{$state->{transaction} || []}) { $urpm->{log}("starting installing packages"); my %install_options_common = ( test => $test, + verbose => $options{verbose}, excludepath => $urpm->{options}{excludepath}, excludedocs => $urpm->{options}{excludedocs}, repackage => $urpm->{options}{repackage}, |