From 87c6bb543a65476ab8a4461437024f0ac19cccb6 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 12 Sep 2005 15:29:12 +0000
Subject: Allow mini-iso install to install urpmi properly

---
 perl-install/install_steps.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

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 {
-- 
cgit v1.2.1