From dd7397fb632e3bce9918bde4bfdf34c3f61340a4 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 18 Aug 2008 15:53:48 +0000 Subject: remove install::pkgs::read_rpmsrate proxy function --- perl-install/install/any.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'perl-install/install/any.pm') diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 9eef9b195..eca8014b2 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -298,7 +298,8 @@ sub load_rate_files { my ($o) = @_; #- must be done after getProvides - install::pkgs::read_rpmsrate($o->{packages}, $o->{rpmsrate_flags_chosen}, '/tmp/rpmsrate', $o->{match_all_hardware}); + require pkgs; + pkgs::read_rpmsrate($o->{packages}, $o->{rpmsrate_flags_chosen}, '/tmp/rpmsrate', $o->{match_all_hardware}); ($o->{compssUsers}, $o->{gtk_display_compssUsers}) = install::pkgs::readCompssUsers('/tmp/compssUsers.pl'); @@ -360,7 +361,7 @@ sub setPackages { my $rpmsrate_flags_was_chosen = $o->{rpmsrate_flags_chosen}; - put_in_hash($o->{rpmsrate_flags_chosen} ||= {}, rpmsrate_always_flags($o)); #- must be done before install::pkgs::read_rpmsrate() + put_in_hash($o->{rpmsrate_flags_chosen} ||= {}, rpmsrate_always_flags($o)); #- must be done before pkgs::read_rpmsrate() load_rate_files($o); install::media::copy_rpms_on_disk($o) if $copy_rpms_on_disk; -- cgit v1.2.1