Attachment 2739 Details for Bug 7016 – propagate the error

[patch] propagate the error

7016.diff (text/plain), 1.86 KB, created by Thierry Vignaud on 2012-09-03 16:17:04 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2012-09-03 16:17:04 CEST

Size: 1.86 KB

patch

obsolete

>diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
>index 620e26b..0115cd0 100644
>--- a/perl-install/install/pkgs.pm
>+++ b/perl-install/install/pkgs.pm
>@@ -774,7 +774,7 @@ sub install {
>     #- place (install::steps_gtk.pm,...).
>     $callback->($packages, user => undef, install => $nb, $total);
> 
>-    _install_raw($packages, $isUpgrade, $callback, $LOG, 0);
>+    my $exit_code = _install_raw($packages, $isUpgrade, $callback, $LOG, 0);
> 
>     log::l("closing install.log file");
>     close $LOG;
>@@ -785,6 +785,8 @@ sub install {
>     clean_rpmdb_shared_regions(); #- workaround librpm which is buggy when using librpm rooted and the just installed rooted library
> 
>     fs::loopback::save_boot($loop_boot);
>+
>+    $exit_code;
> }
> 
> sub _unselect_package {
>diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
>index d595888..748db72 100644
>--- a/perl-install/install/steps.pm
>+++ b/perl-install/install/steps.pm
>@@ -427,6 +427,7 @@ sub installPackages {
>     #- small transaction will be built based on this selection and depslist.
>     my @toInstall = install::pkgs::packagesToInstall($packages);
> 
>+    my $exit_code;
>     my $time = time();
>     { 
> 	local $ENV{DURING_INSTALL} = 1;
>@@ -434,13 +435,14 @@ sub installPackages {
> 	local $ENV{TMP} = '/tmp';
> 	local $ENV{HOME};
> 	local $packages->{options}{auto} = !$o_interactive;
>-	install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
>+	$exit_code = install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
>     }
>     any::writeandclean_ldsoconf($::prefix);
> 
>     log::l("Install took: ", formatTimeRaw(time() - $time));
>     run_program::rooted_or_die($::prefix, 'ldconfig') if !$o->{justdb};
> 
>+    $exit_code and die "Installation failed";
>     install::media::log_sizes();
>     scalar(@toInstall); #- return number of packages installed.
> }

diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 620e26b..0115cd0 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -774,7 +774,7 @@ sub install {
     #- place (install::steps_gtk.pm,...).
     $callback->($packages, user => undef, install => $nb, $total);
 
-    _install_raw($packages, $isUpgrade, $callback, $LOG, 0);
+    my $exit_code = _install_raw($packages, $isUpgrade, $callback, $LOG, 0);
 
     log::l("closing install.log file");
     close $LOG;
@@ -785,6 +785,8 @@ sub install {
     clean_rpmdb_shared_regions(); #- workaround librpm which is buggy when using librpm rooted and the just installed rooted library
 
     fs::loopback::save_boot($loop_boot);
+
+    $exit_code;
 }
 
 sub _unselect_package {
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index d595888..748db72 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -427,6 +427,7 @@ sub installPackages {
     #- small transaction will be built based on this selection and depslist.
     my @toInstall = install::pkgs::packagesToInstall($packages);
 
+    my $exit_code;
     my $time = time();
     { 
 	local $ENV{DURING_INSTALL} = 1;
@@ -434,13 +435,14 @@ sub installPackages {
 	local $ENV{TMP} = '/tmp';
 	local $ENV{HOME};
 	local $packages->{options}{auto} = !$o_interactive;
-	install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
+	$exit_code = install::pkgs::install($o->{isUpgrade}, \@toInstall, $packages, \&installCallback);
     }
     any::writeandclean_ldsoconf($::prefix);
 
     log::l("Install took: ", formatTimeRaw(time() - $time));
     run_program::rooted_or_die($::prefix, 'ldconfig') if !$o->{justdb};
 
+    $exit_code and die "Installation failed";
     install::media::log_sizes();
     scalar(@toInstall); #- return number of packages installed.
 }

Actions: View | Diff

Attachments on bug 7016: 2634 | 2739