From 8e69642c2e7afd3f06a492f0e71df4964cdfd06a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 14 Sep 2007 15:23:03 +0000
Subject: cleanup: use URPM::packages_providing()

---
 perl-install/install/any.pm               |  2 +-
 perl-install/install/pkgs.pm              | 10 ++--------
 perl-install/install/steps.pm             |  2 +-
 perl-install/install/steps_interactive.pm |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index d99940a93..15e58d428 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -579,7 +579,7 @@ sub default_packages {
     push @l, 'quota' if any { $_->{options} =~ /usrquota|grpquota/ } @{$o->{fstab}};
     push @l, uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}});
 
-    my @locale_pkgs = map { install::pkgs::packagesProviding($o->{packages}, 'locales-' . $_) } lang::langsLANGUAGE($o->{locale}{langs});
+    my @locale_pkgs = map { URPM::packages_providing($o->{packages}, 'locales-' . $_) } lang::langsLANGUAGE($o->{locale}{langs});
     unshift @l, uniq(map { $_->name } @locale_pkgs);
 
     @l;
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 4381d3d91..c71312b4d 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -109,18 +109,12 @@ sub size2time {
     }
 }
 
-
-sub packagesProviding {
-    my ($packages, $name) = @_;
-    map { $packages->{depslist}[$_] } keys %{$packages->{provides}{$name} || {}};
-}
-
 #- search package with given name and compatible with current architecture.
 #- take the best one found (most up-to-date).
 sub packageByName {
     my ($packages, $name) = @_;
 
-    my @l = grep { $_->is_arch_compat && $_->name eq $name } packagesProviding($packages, $name);
+    my @l = grep { $_->is_arch_compat && $_->name eq $name } URPM::packages_providing($packages, $name);
 
     my $best;
     foreach (@l) {
@@ -203,7 +197,7 @@ sub packageCallbackChoices_ {
 		my $version = quotemeta($1);
 		find {
 		    $_->name =~ /-$version$/ && ($_->flag_installed || $_->flag_selected);
-		} packagesProviding($urpm, 'kernel');
+		} $urpm->packages_providing('kernel');
 	    } elsif ($_->name =~ /(kernel-.*)-devel-(.*)/) {
 		my $kernel = "$1-$2";
 		my $p = packageByName($urpm, $kernel);
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index a885d1612..2d9b0b5e5 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -553,7 +553,7 @@ sub install_urpmi {
     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, packagesProviding() might return the wrong
+	#- 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/
     ) {
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 5e6c04aa0..c9954b430 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -799,7 +799,7 @@ sub summary {
 	    any::selectCountry($o, $o->{locale}) or return;
 
 	    my $pkg_locale = lang::locale_to_main_locale(lang::getlocale_for_country($o->{locale}{lang}, $o->{locale}{country}));
-	    my @pkgs = install::pkgs::packagesProviding($o->{packages}, "locales-$pkg_locale");
+	    my @pkgs = URPM::packages_providing($o->{packages}, "locales-$pkg_locale");
 	    $o->pkg_install(map { $_->name } @pkgs) if @pkgs;
 
 	    lang::write_and_install($o->{locale}, $o->do_pkgs);
-- 
cgit v1.2.1