diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-02-16 22:33:46 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-17 14:26:20 +0000 |
| commit | 76ffd9e6bfc763f000045c12758f149b6dbbf299 (patch) | |
| tree | e8b91a6a08afc22bdda52f20ea1b3efbd4c0d506 /solenv | |
| parent | c2ece9e23d8dc792833506010c69e4ec1835b257 (diff) | |
Replace installer::logger::include_header_into_globallogfile.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/logger.pm | 29 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/setupscript.pm | 6 |
2 files changed, 5 insertions, 30 deletions
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm index f98d34ccd41e..dba0ea07bb88 100644 --- a/solenv/bin/modules/installer/logger.pm +++ b/solenv/bin/modules/installer/logger.pm @@ -37,7 +37,6 @@ use installer::globals; our @EXPORT_OK = qw( include_header_into_logfile - include_header_into_globallogfile include_timestamp_into_logfile log_hashref globallog @@ -78,30 +77,6 @@ sub include_header_into_logfile } #################################################### -# Including header files into the logfile -#################################################### - -sub include_header_into_globallogfile -{ - my ($message) = @_; - - my $infoline; - - $infoline = "\n" . _get_time_string(); - push( @installer::globals::globallogfileinfo, $infoline); - - $infoline = "######################################################\n"; - push( @installer::globals::globallogfileinfo, $infoline); - - $infoline = "$message\n"; - push( @installer::globals::globallogfileinfo, $infoline); - - - $infoline = "######################################################\n"; - push( @installer::globals::globallogfileinfo, $infoline); -} - -#################################################### # Write timestamp into log file #################################################### @@ -154,13 +129,13 @@ sub globallog $infoline = "\n" . _get_time_string(); push( @installer::globals::globallogfileinfo, $infoline); - $infoline = "################################################################\n"; + $infoline = "######################################################\n"; push( @installer::globals::globallogfileinfo, $infoline); $infoline = "$message\n"; push( @installer::globals::globallogfileinfo, $infoline); - $infoline = "################################################################\n"; + $infoline = "######################################################\n"; push( @installer::globals::globallogfileinfo, $infoline); } diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index 3018bb31429f..7d590c54a52e 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -30,7 +30,7 @@ package installer::setupscript; use installer::existence; use installer::exiter; use installer::globals; -use installer::logger; +use installer::logger qw(globallog); use installer::remover; use installer::scriptitems; use installer::ziplist; @@ -241,7 +241,7 @@ sub replace_all_setupscriptvariables_in_script { my ( $scriptref, $variablesref ) = @_; - installer::logger::include_header_into_globallogfile("Replacing variables in setup script (start)"); + globallog("Replacing variables in setup script (start)"); # make hash of variables to be substituted if they appear in the script my %subs; @@ -282,7 +282,7 @@ sub replace_all_setupscriptvariables_in_script } } - installer::logger::include_header_into_globallogfile("Replacing variables in setup script (end)"); + globallog("Replacing variables in setup script (end)"); return $scriptref; } |