diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-01-30 10:37:11 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-30 10:37:11 +0000 |
| commit | 77439c61af30e77be25ed2864e3d3253a436bd17 (patch) | |
| tree | 25a0140a99156bd51afa5d4db417a60506a25209 | |
| parent | 6fb4405b769740fb3e63a975f957537d0daf81e6 (diff) | |
| download | drakx-77439c61af30e77be25ed2864e3d3253a436bd17.tar drakx-77439c61af30e77be25ed2864e3d3253a436bd17.tar.gz drakx-77439c61af30e77be25ed2864e3d3253a436bd17.tar.bz2 drakx-77439c61af30e77be25ed2864e3d3253a436bd17.tar.xz drakx-77439c61af30e77be25ed2864e3d3253a436bd17.zip | |
(install_urpmi) always set up urpmi, even if not installed
| -rw-r--r-- | perl-install/install/steps.pm | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 92bf5368d..e998f648e 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -560,19 +560,8 @@ EOF sub install_urpmi { my ($o) = @_; - - my $pkg = install::pkgs::packageByName($o->{packages}, 'urpmi'); - if ($pkg && ($pkg->flag_selected || $pkg->flag_installed) - #- this is a workaround. if many urpmi packages are found in the - #- provides of all media, packages_providing() might return the wrong - #- one. This probably needs to be fixed in URPM - || run_program::rooted_get_stdout($::prefix, '/bin/rpm', '-q', 'urpmi') =~ /urpmi/ - ) { - install::media::install_urpmi($o->{method}, $o->{packages}); - install::pkgs::saveCompssUsers($o->{packages}, $o->{compssUsers}); - } else { - log::l("skipping install_urpmi, urpmi not installed"); - } + install::media::install_urpmi($o->{method}, $o->{packages}); + install::pkgs::saveCompssUsers($o->{packages}, $o->{compssUsers}); } sub install_hardware_packages { |