- urpmi

  o diskspace issues are now a fatal error (need perl-URPM 3.20)
    (no use going on with the other transactions)

3 files changed, 11 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 3a83a481..465ecc36 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi
+  o diskspace issues are now a fatal error (need perl-URPM 3.20)
+    (no use going on with the other transactions)
 - gurpmi
   o add support for --clean
 - urpmi.update, urpmi.addmedia, urpmi.removemedia:
diff --git a/urpm/install.pm b/urpm/install.pm
index a688135a..39647f90 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -160,6 +160,7 @@ sub options {
 sub install {
     my ($urpm, $remove, $install, $upgrade, %options) = @_;
     $options{translate_message} = 1;
+    $options{raw_message} = 1;
 
     my $db = urpm::db_open_or_die_($urpm, !$options{test}); #- open in read/write mode unless testing installation.
 
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index bdeb1aac..5f87caa7 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -222,13 +222,18 @@ foreach my $set (@{$state->{transaction} || []}) {
 		%install_options_common,
 	    );
 	    if (@l) {
+		my ($raw_error, $translated) = partition { /^(badarch|bados|installed|badrelocate|conflicts|installed|diskspace|disknodes|requires|conflicts|unknown)\@/ } @l;
+		@l = @$translated;
+		my $fatal = grep { /^disk/ } @$raw_error;
+
 		#- Warning : the following message is parsed in urpm::parallel_*
 		my $msg = N("Installation failed:") . "\n" . join("\n",  map { "\t$_" } @l) . "\n";
-		if ($urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) {
-		    print $msg;
+		if ($fatal || $urpm->{options}{auto} || !$urpm->{options}{'allow-nodeps'} && !$urpm->{options}{'allow-force'}) {
 		    ++$nok;
 		    ++$urpm->{logger_id};
 		    push @errors, @l;
+		    $fatal and last;
+		    print $msg;
 		} else {
 		    $callbacks->{ask_yes_or_no}->(N("Installation failed"), 
 						  $msg . N("Try installation without checking dependencies? (y/N) ")) or ++$nok, next;