summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-05 22:19:30 +0000
committerKarl Berry <karl@freefriends.org>2020-04-05 22:19:30 +0000
commit92678efab8ec51399e4a469261c8020af12031cf (patch)
tree43a4d0e213d3c3d72161f9a5531428cd6d6483f6
parent138ee5f4db02aa5a8156328dcf36d52ba78d0edd (diff)
(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
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm10
1 files changed, 9 insertions, 1 deletions
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'};
}