From ae2b59f49626335b321392d485495ffaf292a956 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 2 Jun 2009 11:27:55 +0000 Subject: write a relocated .tlpobj file into the container, and reactivate the file checking in check-tlnet-consistency git-svn-id: svn://tug.org/texlive/trunk@13575 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPOBJ.pm | 8 +++++++- Master/tlpkg/bin/check-tlnet-consistency | 13 ++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'Master') diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index eb8ef4cdea2..b192442f415 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -530,7 +530,13 @@ sub make_container { } open(TMP,">$tlpobjdir/$self->{'name'}.tlpobj") || die "$0: create($tlpobjdir/$self->{'name'}.tlpobj) failed: $!"; - $self->writeout(\*TMP); + # when we do relative we have to cancel the prefix before writing out + my $selfcopy = $self->copy; + if ($relative) { + $selfcopy->cancel_common_texmf_tree; + $selfcopy->relocated($relative); + } + $selfcopy->writeout(\*TMP); close(TMP); push(@files, "$tlpobjdir/$self->{'name'}.tlpobj"); $tarname = "$containername.tar"; diff --git a/Master/tlpkg/bin/check-tlnet-consistency b/Master/tlpkg/bin/check-tlnet-consistency index 045253382d7..56b7f8527d2 100755 --- a/Master/tlpkg/bin/check-tlnet-consistency +++ b/Master/tlpkg/bin/check-tlnet-consistency @@ -196,13 +196,12 @@ sub main print "$p\n"; } } -# xx every RELOC change shows up. don't understand. -# for my $pkg (keys %filedifferrors) { -# print "file differences in $pkg:\n"; -# for my $l (@{$filedifferrors{$pkg}}) { -# print " $l\n"; -# } -# } + for my $pkg (keys %filedifferrors) { + print "file differences in $pkg:\n"; + for my $l (@{$filedifferrors{$pkg}}) { + print " $l\n"; + } + } } -- cgit v1.2.3