From 048efdcc659eafff2f6160a1dfa20c43a3abddc5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 29 Aug 2008 12:22:53 +0000
Subject: - finish-install:   o use gurpmi.addmedia when available to configure
 urpmi media

---
 perl-install/NEWS   | 3 +++
 perl-install/any.pm | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index a7db58ff5..9a339c042 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- finish-install:
+  o use gurpmi.addmedia when available to configure urpmi media
+
 Version 11.26.1 - 28 August 2008
 
 - fix asterisk in titles
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1645ed201..123abbf3f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -840,11 +840,13 @@ sub sessions_with_order() {
 sub urpmi_add_all_media {
     my ($in) = @_;
 
+    my $binary = find { whereis_binary($_, $::prefix) } 'gurpmi.addmedia', 'urpmi.addmedia' or return;
+    
     #- configure urpmi media if network is up
     require network::tools;
     return if !network::tools::has_network_connection();
     my $_wait = $in->wait_message(N("Please wait"), N("Please wait, adding media..."));
-    run_program::rooted($::prefix, 'urpmi.addmedia', '--distrib', '--mirrorlist', '$MIRRORLIST');
+    run_program::rooted($::prefix, $binary, '--distrib', '--mirrorlist', '$MIRRORLIST');
 }
 
 sub autologin {
-- 
cgit v1.2.1