summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpme4
-rwxr-xr-xurpmi7
2 files changed, 9 insertions, 2 deletions
diff --git a/urpme b/urpme
index ba664284..f68d2854 100644
--- a/urpme
+++ b/urpme
@@ -86,13 +86,13 @@ 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
+ #- Warning : the following message is parsed in urpm::parallel_*
$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
+ #- Warning : the following message is parsed in urpm::parallel_*
$urpm->{fatal}(1, N("The following packages contain %s: %s",
$match, join(' ', @_))); 0 },
callback_base => sub {
diff --git a/urpmi b/urpmi
index 89666f42..4f48bd62 100755
--- a/urpmi
+++ b/urpmi
@@ -592,6 +592,7 @@ foreach my $set (@{$state->{transaction} || []}) {
#- check for local files.
if (my @missing = grep { m|^/| && ! -e $_ } values %transaction_sources_install, values %transaction_sources) {
+ #- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database",
join "\n", map { s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; " $_" } @missing));
++$nok;
@@ -602,6 +603,7 @@ foreach my $set (@{$state->{transaction} || []}) {
if ($install_src) {
if (my @l = grep { /\.src\.rpm$/ } values %transaction_sources_install, values %transaction_sources) {
system("rpm", "-i$rpm_opt", @l, ($root ? ("--root", $root) : @{[]}));
+ #- Warning : the following message is parsed in urpm::parallel_*
$? and message(N("Installation failed")), ++$nok;
}
next;
@@ -655,6 +657,7 @@ foreach my $set (@{$state->{transaction} || []}) {
%install_options_common,
);
if (@l) {
+ #- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
if ($urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) {
++$nok;
@@ -673,6 +676,7 @@ foreach my $set (@{$state->{transaction} || []}) {
%install_options_common,
);
if (@l) {
+ #- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
if (!$urpm->{options}{'allow-force'}) {
++$nok;
@@ -689,6 +693,7 @@ foreach my $set (@{$state->{transaction} || []}) {
%install_options_common,
);
if (@l) {
+ #- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation failed") . ":\n" . join("\n", map { "\t$_" } @l));
++$nok;
push @errors, @l;
@@ -710,6 +715,7 @@ foreach my $set (@{$state->{transaction} || []}) {
#- keep a track of error code.
my $exit_code = 0;
if (values %error_sources) {
+ #- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation failed, some files are missing:\n%s\nYou may want to update your urpmi database",
join "\n", map { s|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|$1xxxx$2|; " $_" } values %error_sources));
$exit_code = 10;
@@ -723,6 +729,7 @@ if ($nok) {
}
} else {
if ($test) {
+ #- Warning : the following message is parsed in urpm::parallel_*
message(N("Installation is possible"));
} elsif (@names || @src_names || @files || @src_files || $auto_select) {
if (@{$state->{transaction} || []} == 0 && @ask_unselect == 0) {