diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-09-13 16:09:09 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-09-13 16:09:09 +0000 |
| commit | 10fcc5bad47867583aa19f031d870fac200a0c6d (patch) | |
| tree | e9c5c21c42a56bbec59bfc72e045f72d96a2dced | |
| parent | 42ae5ba168e210dfbabf3281a3159c1539f1601e (diff) | |
| download | drakx-10fcc5bad47867583aa19f031d870fac200a0c6d.tar drakx-10fcc5bad47867583aa19f031d870fac200a0c6d.tar.gz drakx-10fcc5bad47867583aa19f031d870fac200a0c6d.tar.bz2 drakx-10fcc5bad47867583aa19f031d870fac200a0c6d.tar.xz drakx-10fcc5bad47867583aa19f031d870fac200a0c6d.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index a54cc115e..bc1ed3011 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -396,7 +396,7 @@ END commands::mkdir_("-p", "$prefix/usr/share/config"); template2file("$ENV{SHARE_PATH}/kppprc.in", "$prefix/usr/share/config/kppprc", %toreplace); - miscellaneousNetwork($in, $prefix); + miscellaneousNetwork($prefix); } sub miscellaneousNetwork { diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 616c28b4b..6e36e3787 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -303,8 +303,13 @@ sub pkg_install { log::l("selecting packages"); require pkgs; pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || die "$_ rpm not found") foreach @l; - log::l("installing packages"); - $o->installPackages; + my @toInstall = pkgs::packagesToInstall($o->{packages}); + if (@toInstall) { + log::l("installing packages"); + $o->installPackages; + } else { + log::l("all packages selected are already installed, nothing to do") + } } sub pkg_install_if_requires_satisfied { |