diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-11-17 10:41:09 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-11-17 10:41:09 +0000 |
commit | 325b18931384a3d360da9c52fea973af763b98bd (patch) | |
tree | 1935dd5829b5e4e0237179fd0173fd58a1f3cdeb /urpme | |
parent | 61613e53183dab147039955a6b70cb73fb39bc0c (diff) | |
download | urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar.gz urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar.bz2 urpmi-325b18931384a3d360da9c52fea973af763b98bd.tar.xz urpmi-325b18931384a3d360da9c52fea973af763b98bd.zip |
Add comments in urpme about messages that should not be changed.
But change a message badly worded.
Diffstat (limited to 'urpme')
-rw-r--r-- | urpme | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -86,16 +86,19 @@ my @toremove = $urpm->find_packages_to_remove( force => $force, callback_notfound => sub { my $urpm = shift @_; + #- Warning : the following message is parsed in urpm::parallel_ka_run $urpm->{fatal}(1, (@_ > 1 ? N("unknown packages") : N("unknown package")) . ': ' . join(', ', @_)); 0 }, callback_fuzzy => sub { my $urpm = shift @_; my $match = shift @_; + #- Warning : the following message is parsed in urpm::parallel_ka_run $urpm->{fatal}(1, N("The following packages contain %s: %s", $match, join(' ', @_))); 0 }, callback_base => sub { my $urpm = shift @_; foreach (@_) { + #- Warning : the following message is parsed in urpm::parallel_* $urpm->{error}(N("removing package %s will break your system", $_)); } 0 }, root => $root, @@ -103,6 +106,7 @@ my @toremove = $urpm->find_packages_to_remove( my $list = join "\n", $urpm->translate_why_removed($state, sort @toremove); if ($test && $auto) { + #- Warning : the following message is parsed in urpm::parallel_* my $msg = N("Checking to remove the following packages"); print STDOUT "$msg:\n$list\n"; } elsif (($parallel || @toremove > @l) && !$auto) { @@ -115,8 +119,11 @@ if ($test && $auto) { message_input($askok . N(" (y/N) "), $force && $yesexpr, boolean => 1) =~ /[$yesexpr]/ or exit 0; } -print STDOUT "\n".N("removing %s", join(' ', sort @toremove))."\n"; -@l = $parallel ? - $urpm->parallel_remove(\@toremove, test => $test, force => $force, translate_message => 1) : - $urpm->install(\@toremove, {}, {}, test => $test, force => $force, translate_message => 1); -@l and $urpm->{fatal}(2, N("Removing failed") . ":\n" . join("\n", map { "\t$_" } @l)); +#- Warning : the following message is parsed in urpm::parallel_* +print "\n" . N("removing %s", join(' ', sort @toremove)) . "\n"; +@l = $parallel + ? $urpm->parallel_remove(\@toremove, test => $test, force => $force, translate_message => 1) + : $urpm->install(\@toremove, {}, {}, test => $test, force => $force, translate_message => 1); + +#- Warning : the following message is parsed in urpm::parallel_* +@l and $urpm->{fatal}(2, N("Removal failed") . ":\n" . join("\n", map { "\t$_" } @l)); |