diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPOBJ.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index cb16745516f..f90c0b94d50 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -4,6 +4,8 @@ # This file is licensed under the GNU General Public License version 2 # or any later version. +use strict; use warnings; + package TeXLive::TLPOBJ; my $svnrev = '$Revision$'; @@ -249,7 +251,7 @@ sub _recompute_size { if ($type eq "bin") { my %binfiles = %{$self->{'binfiles'}}; if (defined($binfiles{$arch})) { - foreach $f (@{$binfiles{$arch}}) { + foreach my $f (@{$binfiles{$arch}}) { my $s = $tltree->size_of($f); $nrivblocks += int($s/$TeXLive::TLConfig::BlockSize); $nrivblocks++ if (($s%$TeXLive::TLConfig::BlockSize) > 0); @@ -257,7 +259,7 @@ sub _recompute_size { } } else { if (defined($self->{"${type}files"}) && (@{$self->{"${type}files"}})) { - foreach $f (@{$self->{"${type}files"}}) { + foreach my $f (@{$self->{"${type}files"}}) { my $s = $tltree->size_of($f); if (defined($s)) { $nrivblocks += int($s/$TeXLive::TLConfig::BlockSize); @@ -273,7 +275,7 @@ sub _recompute_size { sub writeout { my $self = shift; - my $fd = (@_ ? $_[0] : STDOUT); + my $fd = (@_ ? $_[0] : *STDOUT); print $fd "name ", $self->name, "\n"; print $fd "category ", $self->category, "\n"; defined($self->{'revision'}) && print $fd "revision $self->{'revision'}\n"; @@ -377,7 +379,7 @@ sub writeout { sub writeout_simple { my $self = shift; - my $fd = (@_ ? $_[0] : STDOUT); + my $fd = (@_ ? $_[0] : *STDOUT); print $fd "name ", $self->name, "\n"; print $fd "category ", $self->category, "\n"; if (defined($self->{'depends'})) { @@ -633,9 +635,8 @@ sub make_container { $selfcopy->writeout(\*TMP); close(TMP); push(@files, "$tlpobjdir/$self->{'name'}.tlpobj"); - # Switch to versioned containers - # $tarname = "$containername.tar"; - $tarname = "$containername.r" . $self->revision . ".tar"; + # versioned containers + my $tarname = "$containername.r" . $self->revision . ".tar"; my $unversionedtar; $unversionedtar = "$containername.tar" if (! $user); @@ -1134,6 +1135,8 @@ sub updmap_cfg_lines { } +our @disabled; # global, should handle differently ... + sub language_dat_lines { my $self = shift; local @disabled = @_; # we use @disabled in the nested sub |