diff options
| -rw-r--r-- | perl-install/install/any.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 6 |
2 files changed, 3 insertions, 8 deletions
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; diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 4aa817999..42d8a541c 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -339,12 +339,6 @@ sub empty_packages { $packages; } -sub read_rpmsrate { - my ($packages, $rpmsrate_flags_chosen, $file, $match_all_hardware) = @_; - require pkgs; - pkgs::read_rpmsrate($packages, $rpmsrate_flags_chosen, $file, $match_all_hardware); -} - sub readCompssUsers { my ($file) = @_; |