diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:25:19 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:25:19 +0000 |
| commit | b1b75234904dba68ab55c4c54119189afe8b8fe9 (patch) | |
| tree | 2360c6c537b21d35a79a5de0b05a3944ef568762 /perl-install/modules.pm | |
| parent | 0ed0f5c5d226551186365fc41cc94dfdef8f9a57 (diff) | |
| download | drakx-b1b75234904dba68ab55c4c54119189afe8b8fe9.tar drakx-b1b75234904dba68ab55c4c54119189afe8b8fe9.tar.gz drakx-b1b75234904dba68ab55c4c54119189afe8b8fe9.tar.bz2 drakx-b1b75234904dba68ab55c4c54119189afe8b8fe9.tar.xz drakx-b1b75234904dba68ab55c4c54119189afe8b8fe9.zip | |
(remove_loaded_modules) rename as filter_out_loaded_modules() for clarity
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index d8da3b8aa..c4c03fb34 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -115,7 +115,7 @@ sub load_with_options { dependencies_closure(cond_mapping_24_26($_)); } @$l; - @l = remove_loaded_modules(@l) or return; + @l = filter_out_loaded_modules(@l) or return; my %options = map { cond_mapping_24_26($_) => $h_options->{$_} } keys %$h_options; load_raw(\@l, \%options); @@ -129,7 +129,7 @@ sub load { sub load_and_configure { my ($conf, $module, $o_options) = @_; - my @l = remove_loaded_modules(dependencies_closure(cond_mapping_24_26($module))); + my @l = filter_out_loaded_modules(dependencies_closure(cond_mapping_24_26($module))); load_raw(\@l, { cond_mapping_24_26($module) => $o_options }); if (member($module, @parallel_zip_modules) @@ -249,7 +249,7 @@ sub set_preload_modules { sub loaded_modules() { map { /(\S+)/ } cat_("/proc/modules"); } -sub remove_loaded_modules { +sub filter_out_loaded_modules { my (@l) = @_; difference2([ uniq(@l) ], [ map { my $s = $_; $s =~ s/_/-/g; $s, $_ } loaded_modules() ]); } |