summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-12 15:29:12 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-09-12 15:29:12 +0000
commit87c6bb543a65476ab8a4461437024f0ac19cccb6 (patch)
treee7a1b89cad94b2aeb3e100272bc5abd693a5a3d0 /perl-install
parent159cfc02dc2f4deee0e5df362184596e0ba266c4 (diff)
downloaddrakx-87c6bb543a65476ab8a4461437024f0ac19cccb6.tar
drakx-87c6bb543a65476ab8a4461437024f0ac19cccb6.tar.gz
drakx-87c6bb543a65476ab8a4461437024f0ac19cccb6.tar.bz2
drakx-87c6bb543a65476ab8a4461437024f0ac19cccb6.tar.xz
drakx-87c6bb543a65476ab8a4461437024f0ac19cccb6.zip
Allow mini-iso install to install urpmi properly
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f8695a026..daedce231 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -589,7 +589,12 @@ sub install_urpmi {
my ($o) = @_;
my $pkg = pkgs::packageByName($o->{packages}, 'urpmi');
- if ($pkg && ($pkg->flag_selected || $pkg->flag_installed)) {
+ if ($pkg && ($pkg->flag_selected || $pkg->flag_installed)
+ #- this is a workaround. if many urpmi packages are found in the
+ #- provides of all media, packagesProviding() might return the wrong
+ #- one. This probably needs to be fixed in URPM
+ || run_program::rooted_get_stdout($::prefix, '/usr/bin/rpm', '-q', 'urpmi') =~ /urpmi/
+ ) {
install_any::install_urpmi($o->{method}, $o->{packages});
pkgs::saveCompssUsers($o->{packages}, $o->{compssUsers});
} else {