From 54e8e1c42eb12a5c920d7cd275ba25ab81186187 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 20 Nov 2006 12:29:23 +0000 Subject: make translate_message the default in install() since we always use it --- gurpmi2 | 1 - urpm.pm | 6 ++++++ urpme | 2 -- urpmi | 1 - 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gurpmi2 b/gurpmi2 index 12aa722c..12fa0e69 100755 --- a/gurpmi2 +++ b/gurpmi2 @@ -298,7 +298,6 @@ sub do_install_3 () { $set->{remove} || [], \%transaction_sources_install, \%transaction_sources, - translate_message => 1, oldpackage => $state->{oldpackage}, callback_inst => $callback_inst, callback_trans => $callback_inst, diff --git a/urpm.pm b/urpm.pm index f7958272..2076d32c 100644 --- a/urpm.pm +++ b/urpm.pm @@ -2853,9 +2853,15 @@ sub install_logger { } #- install packages according to each hash (remove, install or upgrade). +#- options: +#- test, excludepath, nodeps, noorder (unused), delta, +#- callback_open, callback_close, callback_inst, callback_trans, post_clean_cache +#- (more options for trans->run) +#- excludedocs, nosize, noscripts, oldpackage, repackage, ignorearch sub install { my ($urpm, $remove, $install, $upgrade, %options) = @_; my %readmes; + $options{translate_message} = 1; my $db = db_open_or_die($urpm, $urpm->{root}, !$options{test}); #- open in read/write mode unless testing installation. diff --git a/urpme b/urpme index 94a05d2f..f45fb8e1 100644 --- a/urpme +++ b/urpme @@ -134,7 +134,6 @@ print N("removing %s", join(' ', sort @toremove)) . "\n"; \@toremove, test => $test, force => $force, - translate_message => 1, noscripts => $noscripts, repackage => $repackage || $urpm->{options}{repackage}, ) @@ -142,7 +141,6 @@ print N("removing %s", join(' ', sort @toremove)) . "\n"; \@toremove, {}, {}, test => $test, force => $force, - translate_message => 1, noscripts => $noscripts, repackage => $repackage || $urpm->{options}{repackage}, ); diff --git a/urpmi b/urpmi index b0ee9cda..7eba9c16 100755 --- a/urpmi +++ b/urpmi @@ -718,7 +718,6 @@ foreach my $set (@{$state->{transaction} || []}) { excludedocs => $urpm->{options}{excludedocs}, repackage => $urpm->{options}{repackage}, post_clean_cache => $urpm->{options}{'post-clean'}, - translate_message => 1, oldpackage => $state->{oldpackage}, nosize => $urpm->{options}{ignoresize}, ignorearch => $urpm->{options}{ignorearch}, -- cgit v1.2.1