diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 08f7481cbb8..6550cd5d7d0 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -1466,19 +1466,22 @@ improved (checking for duplicates). sub create_fmtutil { my ($tlpdb,$dest,$localconf) = @_; my @lines = $tlpdb->fmtutil_cnf_lines; - _create_config_files ($tlpdb, "texmf/fmtutil/fmtutil-hdr.cnf", $dest, $localconf, 0, '#', \@lines); + _create_config_files($tlpdb, "texmf/fmtutil/fmtutil-hdr.cnf", $dest, + $localconf, 0, '#', \@lines); } sub create_updmap { my ($tlpdb,$dest,$localconf) = @_; my @lines = $tlpdb->updmap_cfg_lines; - _create_config_files ($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, $localconf, 0, '#', \@lines); + _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, + $localconf, 0, '#', \@lines); } sub create_language_dat { my ($tlpdb,$dest,$localconf) = @_; my @lines = $tlpdb->language_dat_lines; - _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us", $dest, $localconf, 0, '%', \@lines); + _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest, + $localconf, 0, '%', \@lines); } sub create_language_def { @@ -1629,8 +1632,8 @@ sub texdir_check { return 0; } - -# no newlines are added, multiple args are just concatenated. + +# no newlines or spaces are added, multiple args are just concatenated. # sub logit { my ($out, $level, @rest) = @_; @@ -1651,7 +1654,7 @@ sub _logit { if (defined($::LOGFILE)) { print $::LOGFILE @rest; } else { - push @::LOGLINES, "@rest"; + push @::LOGLINES, join ("", @rest); } } } @@ -1665,13 +1668,13 @@ strings. The message will be included unless C<-q> was specified. If the log file (see L<process_logging_options>) is defined, it also writes there. -We try to use this sparingly, mainly to give feedback during lengthy -operations. +It is best to use this sparingly, mainly to give feedback during lengthy +operations and for final results. =cut sub info { - my $str = shift; + my $str = join("", @_); my $fh = ($::machinereadable ? \*STDERR : \*STDOUT); logit($fh, 0, $str); chomp($str); @@ -1694,7 +1697,7 @@ package. =cut sub debug { - my $str = "D:@_"; + my $str = "D:" . join("", @_); return if ($::opt_verbosity < 1); logit(\*STDOUT, 1, $str); chomp($str); @@ -1717,7 +1720,7 @@ each package, in addition to the first level. =cut sub ddebug { - my $str = "DD:@_"; + my $str = "DD:" . join("", @_); return if ($::opt_verbosity < 2); logit(\*STDOUT, 2, $str); chomp($str); @@ -1740,7 +1743,7 @@ levels. =cut sub dddebug { - my $str = "DDD:@_"; + my $str = "DDD:" . join("", @_); return if ($::opt_verbosity < 3); logit(\*STDOUT, 3, $str); chomp($str); @@ -1775,8 +1778,8 @@ there. =cut sub tlwarn { - my $str = "@_"; my $savequiet = $::opt_quiet; + my $str = join("", @_); $::opt_quiet = 0; logit (\*STDERR, -100, $str); chomp($str); |