diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-06 15:03:01 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-06 15:03:01 +0000 |
| commit | ac8392846f400354b11890a413e6917457ee8f3f (patch) | |
| tree | 07b9722cf6c1e81f7d7fe3765c2b0b1702f54ec8 | |
| parent | 02738660b87cbf7e04c83479099d8f9090678741 (diff) | |
| download | drakx-ac8392846f400354b11890a413e6917457ee8f3f.tar drakx-ac8392846f400354b11890a413e6917457ee8f3f.tar.gz drakx-ac8392846f400354b11890a413e6917457ee8f3f.tar.bz2 drakx-ac8392846f400354b11890a413e6917457ee8f3f.tar.xz drakx-ac8392846f400354b11890a413e6917457ee8f3f.zip | |
fixed retry of package 3 times everytime even if first install succeeded, now
after first successfull install, go to next package to install.
| -rw-r--r-- | perl-install/pkgs.pm | 12 |
1 files 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; |