aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-11-24 11:50:02 +0000
committerThierry Vignaud <tv@mandriva.org>2006-11-24 11:50:02 +0000
commitf38a83a7295b598bc683a6930830c7324216406f (patch)
tree65751f451d85420185814ab6c0801476c621b7ba
parent058aa3971313806db6bc94f94391ad2e2021d85f (diff)
downloadrpmdrake-f38a83a7295b598bc683a6930830c7324216406f.tar
rpmdrake-f38a83a7295b598bc683a6930830c7324216406f.tar.gz
rpmdrake-f38a83a7295b598bc683a6930830c7324216406f.tar.bz2
rpmdrake-f38a83a7295b598bc683a6930830c7324216406f.tar.xz
rpmdrake-f38a83a7295b598bc683a6930830c7324216406f.zip
(perform_installation) if nothing got installed (eg: because some packages are
missing) do not bother reread the whole hdlists
-rwxr-xr-xrpmdrake4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index 8dd7426d..5fa13acd 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1946,6 +1946,7 @@ Is it ok to continue?", join("\n\n", $r, if_($to_install, $to_install)))) : $to_
}
}
+ my $something_installed;
if (@rpms_install || @rpms_upgrade || @to_remove) {
if (my @missing = grep { m|^/| && ! -e $_ } @rpms_install, @rpms_upgrade) {
interactive_msg_(
@@ -1959,7 +1960,6 @@ Is it ok to continue?", join("\n\n", $r, if_($to_install, $to_install)))) : $to_
}
my $progress_nb;
my $total_nb = scalar grep { m|^/| } @rpms_install, @rpms_upgrade;
- my $something_installed;
my $callback_inst = sub {
my ($urpm, $type, $id, $subtype, $amount, $total) = @_;
my $pkg = defined $id ? $urpm->{depslist}[$id] : undef;
@@ -2059,7 +2059,7 @@ you may now inspect some in order to take actions:"),
$w->{rwindow}->set_sensitive(1);
statusbar_msg_remove($statusbar_msg_id); #- XXX maybe remove this
- return 0;
+ return !$something_installed;
fatal_error:
gurpm::end();