From 76ffd9e6bfc763f000045c12758f149b6dbbf299 Mon Sep 17 00:00:00 2001
From: Tim Retout <tim@retout.co.uk>
Date: Thu, 16 Feb 2012 22:33:46 +0000
Subject: Replace installer::logger::include_header_into_globallogfile.

---
 solenv/bin/modules/installer/logger.pm      | 29 ++---------------------------
 solenv/bin/modules/installer/setupscript.pm |  6 +++---
 2 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'solenv/bin/modules/installer')

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
@@ -77,30 +76,6 @@ sub include_header_into_logfile
     push( @installer::globals::logfileinfo, $infoline);
 }
 
-####################################################
-# 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;
 }
-- 
cgit