From 92678efab8ec51399e4a469261c8020af12031cf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 5 Apr 2020 22:19:30 +0000 Subject: (not_virtual_install_package): for a local_compressed install, request versioned container. That is, the unversioned symlinks in archive/ in the .iso image cannot be dereferenced on Windows. git-svn-id: svn://tug.org/texlive/trunk@54619 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPDB.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 35255ce0228..eaba4bd607a 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -1779,7 +1779,13 @@ sub not_virtual_install_package { $container = \@installfiles; } elsif ($media eq 'local_compressed') { for my $ext (map { $Compressors{$_}{'extension'} } keys %Compressors) { - if (-r "$root/$Archive/$pkg.tar.$ext") { + # request versioned containers when local (i.e., ISO image), + # since the unversioned symlinks cannot be dereferenced + # on Windows. + my $rev = $tlpobj->revision; + if (-r "$root/$Archive/$pkg.$rev.tar.$ext") { + $container = "$root/$Archive/$pkg.$rev.tar.$ext"; + } elsif (-r "$root/$Archive/$pkg.tar.$ext") { $container = "$root/$Archive/$pkg.tar.$ext"; } } @@ -1789,6 +1795,8 @@ sub not_virtual_install_package { return(0); } } elsif (&media eq 'NET') { + # Since the NET server cannot be a Windows machine, + # ok to request the unversioned file. $container = "$root/$Archive/$pkg.tar." . $Compressors{$DefaultCompressorFormat}{'extension'}; } -- cgit v1.2.3