This patch is public domain.
From 8f7ac6749fce3ba0c16d528d6fd65157ee3318c9 Mon Sep 17 00:00:00 2001
Date: Mon, 25 Oct 2010 14:36:54 -0700
Subject: [PATCH] Moved the debuginfo wrappers into the call itself.
Also condensed the getparameters code.
---
solenv/bin/modules/installer/archivefiles.pm | 2 +-
solenv/bin/modules/installer/configuration.pm | 24 ++++----
solenv/bin/modules/installer/files.pm | 16 +++---
solenv/bin/modules/installer/logger.pm | 7 ++-
solenv/bin/modules/installer/parameter.pm | 34 +++++-------
solenv/bin/modules/installer/scriptitems.pm | 72 ++++++++++++------------
6 files changed, 74 insertions(+), 81 deletions(-)
diff --git a/solenv/bin/modules/installer/archivefiles.pm
b/solenv/bin/modules/installer/archivefiles.pm
index b7636ca..0b1688e 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -148,7 +148,7 @@ sub resolving_archive_flag
{
my ($filesarrayref, $additionalpathsref, $languagestringref, $loggingdir)
= @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::archivefiles::resolving_archive_flag :
$#{$filesarrayref} : $#{$additionalpathsref} : $$languagestringref :
$loggingdir"); }
+
installer::logger::debuginfo("installer::archivefiles::resolving_archive_flag :
$#{$filesarrayref} : $#{$additionalpathsref} : $$languagestringref :
$loggingdir");
my @newallfilesarray = ();
diff --git a/solenv/bin/modules/installer/configuration.pm
b/solenv/bin/modules/installer/configuration.pm
index b7d054b..bbd6398 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -46,7 +46,7 @@ sub analyze_path_of_configurationitem
{
my ($configurationitemsref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::analyze_path_of_configurationitem
: $#{$configurationitemsref}"); }
+
installer::logger::debuginfo("installer::configuration::analyze_path_of_configurationitem
: $#{$configurationitemsref}");
my ($startpath, $nodes, $name, $packagename, $onenode, $first, $second,
$third, $bracketnode);
@@ -193,7 +193,7 @@ sub insert_start_block_into_configfile
{
my ($configfileref, $oneconfig) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_start_block_into_configfile
: $#{$configfileref} : $oneconfig->{'name'}"); }
+
installer::logger::debuginfo("installer::configuration::insert_start_block_into_configfile
: $#{$configfileref} : $oneconfig->{'name'}");
my $line = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
push( @{$configfileref}, $line);
@@ -217,7 +217,7 @@ sub insert_end_block_into_configfile
{
my ($configfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_end_block_into_configfile
: $#{$configfileref}"); }
+
installer::logger::debuginfo("installer::configuration::insert_end_block_into_configfile
: $#{$configfileref}");
my $line = "\n" . '</oor:component-data>' . "\n";
push( @{$configfileref}, $line);
@@ -231,7 +231,7 @@ sub get_node_content
{
my ($nodeline) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::get_node_content :
$nodeline"); }
+ installer::logger::debuginfo("installer::configuration::get_node_content :
$nodeline");
my $content = "";
@@ -256,7 +256,7 @@ sub get_node_line_number
{
my ($nodecount, $oneconfig, $oneconfigfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::get_node_line_number :
$nodecount : $oneconfig->{'name'} : $#{$oneconfigfileref}"); }
+
installer::logger::debuginfo("installer::configuration::get_node_line_number :
$nodecount : $oneconfig->{'name'} : $#{$oneconfigfileref}");
my $linenumber = -1; # the node does not exists, if returnvalue is
"-1"
@@ -336,7 +336,7 @@ sub insert_into_config_file
{
my ($oneconfig, $oneconfigfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_into_config_file
: $oneconfig->{'nodenumber'} : $#{$oneconfigfileref}"); }
+
installer::logger::debuginfo("installer::configuration::insert_into_config_file
: $oneconfig->{'nodenumber'} : $#{$oneconfigfileref}");
my ($nodename, $nodecontent, $newnodeline, $bracketkey, $line,
$insertline);
@@ -632,7 +632,7 @@ sub insert_tabs_into_configfile
{
my ($configfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_tabs_into_configfile
: $#{$configfileref}"); }
+
installer::logger::debuginfo("installer::configuration::insert_tabs_into_configfile
: $#{$configfileref}");
my $counter = 0;
@@ -685,7 +685,7 @@ sub collect_all_configuration_items
{
my ($configurationitemsref, $item) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::collect_all_configuration_items
: $#{$configurationitemsref} : $item"); }
+
installer::logger::debuginfo("installer::configuration::collect_all_configuration_items
: $#{$configurationitemsref} : $item");
my @allitems = ();
@@ -710,7 +710,7 @@ sub get_all_configitems_at_module
{
my ($moduleid, $configurationitemsref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::get_all_configitems_at_module
: $moduleid : $#{$configurationitemsref}"); }
+
installer::logger::debuginfo("installer::configuration::get_all_configitems_at_module
: $moduleid : $#{$configurationitemsref}");
my @moduleconfigurationitems = ();
@@ -735,7 +735,7 @@ sub save_and_zip_configfile
{
my ($oneconfigfileref, $onefile, $onemodule, $configdir) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::save_and_zip_configfile
: $#{$oneconfigfileref} : $onefile : $onemodule : $configdir"); }
+
installer::logger::debuginfo("installer::configuration::save_and_zip_configfile
: $#{$oneconfigfileref} : $onefile : $onemodule : $configdir");
my $savefilename = $onefile;
$savefilename =~ s/\./\_/g;
@@ -788,7 +788,7 @@ sub add_zipfile_into_filelist
{
my ($zipfilename, $configdir, $filesarrayref, $onemodule) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::add_zipfile_into_filelist:
$zipfilename : $configdir : $#{$filesarrayref} : $onemodule"); }
+
installer::logger::debuginfo("installer::configuration::add_zipfile_into_filelist:
$zipfilename : $configdir : $#{$filesarrayref} : $onemodule");
my $longzipfilename = $configdir . $installer::globals::separator .
$zipfilename;
my $gid = "gid_" . $zipfilename;
@@ -825,7 +825,7 @@ sub create_configuration_files
{
my ($configurationitemsref, $filesarrayref, $languagestringref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::create_configuration_files:
$#{$configurationitemsref} : $#{$filesarrayref} : $$languagestringref"); }
+
installer::logger::debuginfo("installer::configuration::create_configuration_files:
$#{$configurationitemsref} : $#{$filesarrayref} : $$languagestringref");
installer::logger::include_header_into_logfile("Creating configuration
files:");
diff --git a/solenv/bin/modules/installer/files.pm
b/solenv/bin/modules/installer/files.pm
index 6d38017..b88f914 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -38,7 +38,7 @@ sub check_file
{
my ($arg) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::check_file : $arg"); }
+ installer::logger::debuginfo("installer::files::check_file : $arg");
if(!( -f $arg ))
{
@@ -51,7 +51,7 @@ sub read_file
my ($localfile) = @_;
my @localfile = ();
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::read_file : $localfile"); }
+ installer::logger::debuginfo("installer::files::read_file : $localfile");
open( IN, "<$localfile" ) || installer::exiter::exit_program("ERROR:
Cannot open file $localfile for reading", "read_file");
@@ -75,7 +75,7 @@ sub save_file
{
my ($savefile, $savecontent) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_file : $savefile :
$#{$savecontent}"); }
+ installer::logger::debuginfo("installer::files::save_file : $savefile :
$#{$savecontent}");
if ( open( OUT, ">$savefile" ) )
{
@@ -102,7 +102,7 @@ sub save_hash
{
my ($savefile, $hashref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_hash : $savefile"); }
+ installer::logger::debuginfo("installer::files::save_hash : $savefile");
my @printcontent = ();
@@ -125,7 +125,7 @@ sub save_array_of_hashes
{
my ($savefile, $arrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_array_of_hashes :
$savefile : $#{$arrayref}"); }
+ installer::logger::debuginfo("installer::files::save_array_of_hashes :
$savefile : $#{$arrayref}");
my @printcontent = ();
@@ -155,7 +155,7 @@ sub save_array_of_hashes_modules
{
my ($savefile, $arrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_array_of_hashes :
$savefile : $#{$arrayref}"); }
+ installer::logger::debuginfo("installer::files::save_array_of_hashes :
$savefile : $#{$arrayref}");
my @printcontent = ();
@@ -189,7 +189,7 @@ sub read_binary_file
{
my ($filename) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::read_binary_file : $filename");
}
+ installer::logger::debuginfo("installer::files::read_binary_file :
$filename");
my $file;
@@ -208,7 +208,7 @@ sub save_binary_file
{
my ($file, $filename) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_binary_file : $filename");
}
+ installer::logger::debuginfo("installer::files::save_binary_file :
$filename");
open( OUT, ">$filename" ) || installer::exiter::exit_program("ERROR:
Cannot open file $filename for writing", "save_binary_file");
binmode OUT;
diff --git a/solenv/bin/modules/installer/logger.pm
b/solenv/bin/modules/installer/logger.pm
index 0f19591..5ca5e5a 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -163,9 +163,10 @@ sub copy_globalinfo_into_logfile
sub debuginfo
{
my ( $message ) = @_;
-
- $message = $message . "\n";
- push(@installer::globals::functioncalls, $message);
+ if ( $installer::globals::debug ){
+ $message = $message . "\n";
+ push(@installer::globals::functioncalls, $message);
+ }
}
###############################################################
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 6e0c05e..4e3ab91 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -41,7 +41,7 @@ use installer::systemactions;
sub usage
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::usage"); }
+ installer::logger::debuginfo("installer::parameter::usage");
print <<Ende;
--------------------------------------------------------------------------------
@@ -97,32 +97,24 @@ Ende
sub saveparameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::saveparameter"); }
+ installer::logger::debuginfo("installer::parameter::saveparameter");
- my $include = "";
-
installer::logger::globallog("Command line arguments:");
- for ( my $i = 0; $i <= $#ARGV; $i++ )
- {
- $include = $ARGV[$i] . "\n";
- push(@installer::globals::globallogfileinfo, $include);
- }
-
- # also saving global settings:
-
- $include = "Separator: $installer::globals::separator\n";
- push(@installer::globals::globallogfileinfo, $include);
-
+ # I don't know why we have to stick the \n on the end.
+ # It seems more efficient to let that happen during print.
+ push @installer::globals::globallogfileinfo, map("$_\n", @ARGV),
"Separator: $installer::globals::separator\n";
}
#####################################
# Reading parameter
#####################################
+# This should be called parseparameter
+#####################################
sub getparameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::getparameter"); }
+ installer::logger::debuginfo("installer::parameter::getparameter");
while ( $#ARGV >= 0 )
{
@@ -194,7 +186,7 @@ sub getparameter
sub control_fundamental_parameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::control_fundamental_parameter");
}
+
installer::logger::debuginfo("installer::parameter::control_fundamental_parameter");
if ($installer::globals::product eq "")
{
@@ -213,7 +205,7 @@ sub make_path_absolute
{
my ($pathref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::make_path_absolute :
$$pathref"); }
+ installer::logger::debuginfo("installer::parameter::make_path_absolute :
$$pathref");
if ( $installer::globals::isunix )
{
@@ -265,7 +257,7 @@ sub make_path_absolute
sub setglobalvariables
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::setglobalvariables"); }
+ installer::logger::debuginfo("installer::parameter::setglobalvariables");
# Setting the installertype directory corresponding to the environment
variable PKGFORMAT
# The global variable $installer::globals::packageformat can only contain
one package format.
@@ -491,7 +483,7 @@ sub setglobalvariables
sub control_required_parameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::control_required_parameter");
}
+
installer::logger::debuginfo("installer::parameter::control_required_parameter");
if (!($installer::globals::is_copy_only_project))
{
@@ -603,7 +595,7 @@ sub control_required_parameter
sub outputparameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::outputparameter"); }
+ installer::logger::debuginfo("installer::parameter::outputparameter");
my $element;
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index ee5a8c6..e62fc35 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -45,7 +45,7 @@ sub resolve_all_directory_names
{
my ($directoryarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::resolve_all_directory_names
: $#{$directoryarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::resolve_all_directory_names
: $#{$directoryarrayref}");
# After this procedure the hash shall contain the complete language
# dependent path, not only the language dependent HostName.
@@ -160,7 +160,7 @@ sub remove_delete_only_files_from_productlists
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_delete_only_files_from_productlists
: $#{$productarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_delete_only_files_from_productlists
: $#{$productarrayref}");
my @newitems = ();
@@ -189,7 +189,7 @@ sub remove_notinsuite_files_from_productlists
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists
: $#{$productarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists
: $#{$productarrayref}");
my @newitems = ();
@@ -223,7 +223,7 @@ sub remove_office_start_language_files
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists
: $#{$productarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists
: $#{$productarrayref}");
my @newitems = ();
@@ -256,7 +256,7 @@ sub remove_uninstall_regitems_from_script
{
my ($registryarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script
: $#{$registryarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script
: $#{$registryarrayref}");
my @newitems = ();
@@ -309,7 +309,7 @@ sub resolving_all_languages_in_productlists
{
my ($productarrayref, $languagesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::resolving_all_languages_in_productlists
: $#{$productarrayref} : $#{$languagesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::resolving_all_languages_in_productlists
: $#{$productarrayref} : $#{$languagesarrayref}");
my @itemsinalllanguages = ();
@@ -711,7 +711,7 @@ sub changing_name_of_language_dependent_keys
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::changing_name_of_language_dependent_keys
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::changing_name_of_language_dependent_keys
: $#{$itemsarrayref}");
# Changing key for multilingual items from "Name ( )" to "Name" or
"HostName ( )" to "HostName"
@@ -779,7 +779,7 @@ sub replace_setup_variables
{
my ($itemsarrayref, $languagestringref, $hashref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::replace_setup_variables :
$#{$itemsarrayref} : $$languagestringref : $hashref->{'PRODUCTNAME'}"); }
+
installer::logger::debuginfo("installer::scriptitems::replace_setup_variables :
$#{$itemsarrayref} : $$languagestringref : $hashref->{'PRODUCTNAME'}");
my $languagesstring = $$languagestringref;
$languagesstring =~ s/\_/ /g; # replacing underscore with whitespace
@@ -869,7 +869,7 @@ sub remove_non_existent_languages_in_productlists
{
my ($itemsarrayref, $languagestringref, $searchkey, $itemtype) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_non_existent_languages_in_productlists
: $#{$itemsarrayref} : $$languagestringref : $searchkey : $itemtype"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_non_existent_languages_in_productlists
: $#{$itemsarrayref} : $$languagestringref : $searchkey : $itemtype");
# Removing of all non existent files, for instance asian fonts
@@ -918,7 +918,7 @@ sub get_Directoryname_From_Directorygid
{
my ($dirsarrayref ,$searchgid, $onelanguage, $oneitemgid) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_Directoryname_From_Directorygid
: $#{$dirsarrayref} : $searchgid : $onelanguage"); }
+
installer::logger::debuginfo("installer::scriptitems::get_Directoryname_From_Directorygid
: $#{$dirsarrayref} : $searchgid : $onelanguage");
my $directoryname = "";
my $onedirectory;
@@ -971,7 +971,7 @@ sub get_Destination_Directory_For_Item_From_Directorylist
# this is used for Fi
{
my ($itemarrayref, $dirsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist
: $#{$itemarrayref} : $#{$dirsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist
: $#{$itemarrayref} : $#{$dirsarrayref}");
for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
{
@@ -1034,7 +1034,7 @@ sub get_sourcepath_from_filename_and_includepath_classic
{
my ($searchfilenameref, $includepatharrayref, $write_logfile) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic
: $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
+
installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic
: $$searchfilenameref : $#{$includepatharrayref} : $write_logfile");
my ($onefile, $includepath, $infoline);
@@ -1091,7 +1091,7 @@ sub get_sourcepath_from_filename_and_includepath
{
my ($searchfilenameref, $unused, $write_logfile) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath
: $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
+
installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath
: $$searchfilenameref : $#{$includepatharrayref} : $write_logfile");
my ($onefile, $includepath, $infoline);
@@ -1203,7 +1203,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
{
my ($filesarrayref, $includepatharrayref, $dirsref, $item) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist
: $#{$filesarrayref} : $#{$includepatharrayref} : $item"); }
+
installer::logger::debuginfo("installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist
: $#{$filesarrayref} : $#{$includepatharrayref} : $item");
installer::logger::include_header_into_logfile("$item:");
@@ -1298,7 +1298,7 @@ sub remove_Files_For_Languagepacks
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks
: $#{$filesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks
: $#{$filesarrayref}");
my $infoline;
@@ -1334,7 +1334,7 @@ sub remove_Files_Without_Sourcedirectory
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory
: $#{$filesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory
: $#{$filesarrayref}");
my $infoline;
@@ -1451,7 +1451,7 @@ sub add_License_Files_into_Installdir
{
my ($filesarrayref, $dirsarrayref, $languagesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_License_Files_into_Installdir
: $#{$filesarrayref} : $#{$languagesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::add_License_Files_into_Installdir
: $#{$filesarrayref} : $#{$languagesarrayref}");
my $infoline;
@@ -1726,7 +1726,7 @@ sub remove_scpactions_without_name
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name
: $#{$itemsarrayref}");
my $infoline;
@@ -1761,7 +1761,7 @@ sub change_keys_of_scpactions
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions
: $#{$itemsarrayref}");
for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
{
@@ -1806,7 +1806,7 @@ sub remove_Xpdonly_Items
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items :
$#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items
: $#{$itemsarrayref}");
my $infoline;
@@ -1844,7 +1844,7 @@ sub remove_Languagepacklibraries_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -1882,7 +1882,7 @@ sub remove_patchonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -1920,7 +1920,7 @@ sub remove_tabonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -1958,7 +1958,7 @@ sub remove_installedproductonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -1995,7 +1995,7 @@ sub quoting_illegal_filenames
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames
: $#{$filesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames
: $#{$filesarrayref}");
# This function has to be removed as soon as possible!
@@ -2061,7 +2061,7 @@ sub collect_directories_from_filesarray
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray
: $#{$filesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray
: $#{$filesarrayref}");
my @alldirectories = ();
my %alldirectoryhash = ();
@@ -2171,7 +2171,7 @@ sub
collect_directories_with_create_flag_from_directoryarray
{
my ($directoryarrayref, $alldirectoryhash) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::collect_directories_with_create_flag_from_directoryarray
: $#{$directoryarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::collect_directories_with_create_flag_from_directoryarray
: $#{$directoryarrayref}");
my $alreadyincluded = 0;
my @alldirectories = ();
@@ -2296,7 +2296,7 @@ sub get_destination_file_path_for_links
{
my ($linksarrayref, $filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_destination_file_path_for_links
: $#{$linksarrayref} : $#{$filesarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::get_destination_file_path_for_links
: $#{$linksarrayref} : $#{$filesarrayref}");
my $infoline;
@@ -2343,7 +2343,7 @@ sub get_destination_link_path_for_links
{
my ($linksarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_destination_link_path_for_links
: $#{$linksarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::get_destination_link_path_for_links
: $#{$linksarrayref}");
my $infoline;
@@ -2390,7 +2390,7 @@ sub remove_workstation_only_items
{
my ($itemarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items
: $#{$itemarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items
: $#{$itemarrayref}");
my @newitemarray = ();
@@ -2420,7 +2420,7 @@ sub resolve_links_with_flag_relative
{
my ($linksarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::resolve_links_with_flag_relative
: $#{$linksarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::resolve_links_with_flag_relative
: $#{$linksarrayref}");
# Before this step is:
# destination=program/libsalhelperC52.so.3, this will be the name of the
link
@@ -2520,7 +2520,7 @@ sub get_string_of_modulegids_for_itemgid
{
my ($module_lookup_table, $modulesref, $itemgid, $itemname) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid
: $#{$modulesref} : $itemgid : $itemname"); }
+
installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid
: $#{$modulesref} : $itemgid : $itemname");
my $allmodules = "";
my $haslanguagemodule = 0;
@@ -2560,7 +2560,7 @@ sub assigning_modules_to_items
{
my ($modulesref, $itemsref, $itemname) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::assigning_modules_to_items
: $#{$modulesref} : $#{$itemsref} : $itemname"); }
+
installer::logger::debuginfo("installer::scriptitems::assigning_modules_to_items
: $#{$modulesref} : $#{$itemsref} : $itemname");
my $infoline = "";
my $languageassignmenterror = 0;
@@ -2626,7 +2626,7 @@ sub add_rootpath_to_directories
{
my ($dirsref, $rootpath) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories
: $#{$dirsref} : $rootpath"); }
+
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories
: $#{$dirsref} : $rootpath");
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
@@ -2657,7 +2657,7 @@ sub add_rootpath_to_files
{
my ($filesref, $rootpath) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files :
$#{$filesref} : $rootpath"); }
+
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files :
$#{$filesref} : $rootpath");
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
@@ -2672,7 +2672,7 @@ sub add_rootpath_to_links
{
my ($linksref, $rootpath) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links :
$#{$linksref} : $rootpath"); }
+
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links :
$#{$linksref} : $rootpath");
for ( my $i = 0; $i <= $#{$linksref}; $i++ )
{
--
1.6.2.5
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
