diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-02-15 18:50:06 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-16 13:46:12 +0000 |
| commit | a1bc2d7d23e160bd9bb9570b4d512eee740aca15 (patch) | |
| tree | b4468cb417399b4a5f7f731dc36e40c0d5be4a8a /solenv | |
| parent | Inline and simplify installer::sorter::sort_array_of_hashes_numerically. (diff) | |
| download | core-a1bc2d7d23e160bd9bb9570b4d512eee740aca15.tar.gz core-a1bc2d7d23e160bd9bb9570b4d512eee740aca15.zip | |
Use Exporter for installer::sorter
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/make_installer.pl | 8 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/sorter.pm | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 4f35aed4ed00..45dede0c236e 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -57,7 +57,7 @@ use installer::scpzipfiles; use installer::scriptitems; use installer::setupscript; use installer::simplepackage; -use installer::sorter; +use installer::sorter qw(sorting_array_of_hashes); use installer::strip; use installer::substfilenamefiles; use installer::systemactions; @@ -1101,7 +1101,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3alangpack.log", $directoriesforepmarrayref); } ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3blangpack.log", $directoriesforepmarrayref); } - installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); + sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3clangpack.log", $directoriesforepmarrayref); } if ( $installer::globals::iswindowsbuild ) @@ -1130,7 +1130,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3ahelppack.log", $directoriesforepmarrayref); } ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3bhelppack.log", $directoriesforepmarrayref); } - installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); + sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3chelppack.log", $directoriesforepmarrayref); } if ( $installer::globals::iswindowsbuild ) @@ -1171,7 +1171,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist4_patch.log", $directoriesforepmarrayref); } - installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); + sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist5_patch.log", $directoriesforepmarrayref); } } } diff --git a/solenv/bin/modules/installer/sorter.pm b/solenv/bin/modules/installer/sorter.pm index 91ed9aed0b5f..54e5c34c516b 100644 --- a/solenv/bin/modules/installer/sorter.pm +++ b/solenv/bin/modules/installer/sorter.pm @@ -30,6 +30,12 @@ package installer::sorter; use strict; use warnings; +use base 'Exporter'; + +our @EXPORT_OK = qw( + sorting_array_of_hashes +); + ######################################### # Sorting an array of hashes ######################################### |