From ac8392846f400354b11890a413e6917457ee8f3f Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Thu, 6 Sep 2001 15:03:01 +0000 Subject: fixed retry of package 3 times everytime even if first install succeeded, now after first successfull install, go to next package to install. --- perl-install/pkgs.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index d8854e60d..d844e7ec6 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -1449,15 +1449,17 @@ sub install($$$;$$) { $retry_package = shift @transToInstall; $retry_count = 3; } else { - if ($retry_count) { - log::l("retrying installing package $retry_package->[$FILE] alone in a transaction"); - --$retry_count; - } else { - if (!packageFlagInstalled($retry_package) && $retry_package->[$MEDIUM]{selected} && !exists($ignoreBadPkg{packageName($retry_package)})) { + if (!packageFlagInstalled($retry_package) && $retry_package->[$MEDIUM]{selected} && !exists($ignoreBadPkg{packageName($retry_package)})) { + if ($retry_count) { + log::l("retrying installing package $retry_package->[$FILE] alone in a transaction"); + --$retry_count; + } else { log::l("bad package $retry_package->[$FILE] unable to be installed"); packageSetFlagSelected($retry_package, 0); cdie ("error installing package list: $retry_package->[$FILE]"); } + } + if (packageFlagInstalled($retry_package) || ! packageFlagSelected($retry_package)) { packageFreeHeader($retry_package); $retry_package = shift @transToInstall; $retry_count = 3; -- cgit v1.2.1