diff options
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r-- | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm index e83a6e804a..0e9425d2c0 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 60693 2021-10-04 02:24:25Z preining $ +# $Id: TLUtils.pm 60823 2021-10-21 18:17:33Z karl $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007-2021 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 60693 $'; +my $svnrev = '$Revision: 60823 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -112,7 +112,7 @@ C<TeXLive::TLUtils> - TeX Live infrastructure miscellany TeXLive::TLUtils::report_tlpdb_differences(\%ret); TeXLive::TLUtils::tlnet_disabled_packages($root); TeXLive::TLUtils::mktexupd(); - TeXLive::TLUtils::setup_sys_user_mode($optsref,$tmfc, $tmfsc, $tmfv, $tmfsv); + TeXLive::TLUtils::setup_sys_user_mode($prg,$optsref,$tmfc,$tmfsc,$tmfv,$tmfsv); TeXLive::TLUtils::prepend_own_path(); TeXLive::TLUtils::repository_to_array($str); @@ -4677,9 +4677,14 @@ sub mktexupd { =item C<setup_sys_user_mode($prg, $optsref, $tmfc, $tmfsc, $tmfv, $tmfsv)> -Return two-element list C<($texmfconfig,$texmfvar)> of which directories -to use, either user or sys. If C<$prg> is C<mktexfmt>, and the system -dirs are writable, use them even if we are in user mode. +Return two-element list C<($texmfconfig,$texmfvar)> specifying which +directories to use, either user or sys. If C<$optsref->{'sys'}> is +true, we are in sys mode; else if C<$optsref->{'user'}> is set, we are +in user mode; else a fatal error. + +If C<$prg> eq C<"mktexfmt">, and C<$TEXMFSYSVAR/web2c> is writable, use +it instead of C<$TEXMFVAR>, even if we are in user mode. C<$TEXMFCONFIG> +is not switched, however. =cut |