diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-02-16 20:54:19 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-17 14:26:19 +0000 |
| commit | c2ece9e23d8dc792833506010c69e4ec1835b257 (patch) | |
| tree | 0c40e0fb80115dae26f7bfc29d2fd2b14713719e /solenv | |
| parent | f2808e15b44d8213b90c1b4ba08b5ce6dba01048 (diff) | |
Move global starttime into installer::logger
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/logger.pm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 33d6e0aa47cc..f066c344af7b 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -431,8 +431,6 @@ BEGIN $postprocess_standardepm = 0; $mergemodules_analyzed = 0; - $starttime = ""; - @solarispatchscripts = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall", "postinstall", "preinstall", "i.none"); @solarispatchscriptsforextensions = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall_extensions", "postinstall_extensions", "preinstall", "i.none"); @solarispatchfiles = (".diPatch", "patchinfo"); diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm index 681c3d1fff79..f98d34ccd41e 100644 --- a/solenv/bin/modules/installer/logger.pm +++ b/solenv/bin/modules/installer/logger.pm @@ -51,6 +51,8 @@ our @EXPORT_OK = qw( print_error ); +my $starttime; + #################################################### # Including header files into the logfile #################################################### @@ -207,7 +209,7 @@ sub savedebug sub starttime { - $installer::globals::starttime = time(); + $starttime = time(); } ############################################################### @@ -258,7 +260,7 @@ sub _convert_timestring sub _get_time_string { my $currenttime = time(); - $currenttime = $currenttime - $installer::globals::starttime; + $currenttime = $currenttime - $starttime; $currenttime = _convert_timestring($currenttime); $currenttime = localtime() . " \(" . $currenttime . "\)\n"; return $currenttime; |