summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-04 11:35:12 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-04 11:35:12 +0000
commit574c3628c48e07eea80d0250dad59787296de92d (patch)
tree5323e89f5f1c5cd868b54ba5fd6406b8c6567447
parent6db0ccc0b1e65f82f266981290d18e1fa719bcf1 (diff)
downloaddrakx-574c3628c48e07eea80d0250dad59787296de92d.tar
drakx-574c3628c48e07eea80d0250dad59787296de92d.tar.gz
drakx-574c3628c48e07eea80d0250dad59787296de92d.tar.bz2
drakx-574c3628c48e07eea80d0250dad59787296de92d.tar.xz
drakx-574c3628c48e07eea80d0250dad59787296de92d.zip
(_install_raw::trans_error_summary) do not die if a transaction
failed ; only warn about it in graphical mode (no more a fata error for auto install)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm5
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b02be4ab5..6b43cedfa 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- only warn if a transaction failed (no more a fata error for auto
+ installs)
- prevent urpmi from leaking a log file descriptor per transaction
- really set urpmi in automatic mode for non-interactive installs
(and not vice-versa)
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 15556e224..4acb84ac9 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -764,7 +764,10 @@ sub _install_raw {
trans_error_summary => sub {
my ($nok, $errors) = @_;
log::l($nok . " installation transactions failed");
- die "installation of rpms failed:\n " . join("\n", @$errors);
+ if (!$packages->{options}{auto}) {
+ $::o->ask_warn(N("Error"), N("%d installation transactions failed", $nok) . "\n\n" .
+ N("Installation of packages failed:") . "\n\n" . join("\n", @$errors));
+ }
},
message => sub {
my ($title, $message) = @_;