From c22509495342cccf3b2c3313eafde5d346801c2c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 7 Oct 2020 20:54:02 +0000 Subject: lwarp (6oct20) git-svn-id: svn://tug.org/texlive/trunk@56584 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/lwarp/lwarpmk.lua | 2 +- .../source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua index 11a09285da4..f9b591e3132 100755 --- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua +++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2020 Brian Dunn -printversion = "v0.891" +printversion = "v0.892" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 6cb2f0c34e6..d17509cddb3 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 56458 2020-09-27 22:20:18Z preining $ +# $Id: tlmgr.pl 56566 2020-10-06 03:40:54Z preining $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 56458 $'; -my $datrev = '$Date: 2020-09-28 00:20:18 +0200 (Mon, 28 Sep 2020) $'; +my $svnrev = '$Revision: 56566 $'; +my $datrev = '$Date: 2020-10-06 05:40:54 +0200 (Tue, 06 Oct 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -1507,7 +1507,9 @@ sub action_path { $ret |= TeXLive::TLUtils::w32_add_to_path( $localtlpdb->root . "/bin/win32", $winadminmode); - $ret |= TeXLive::TLWinGoo::broadcast_env(); + # ignore this return value, since broadcase_env might return + # nothing in case of errors, and there is no way around it. + # $ret |= TeXLive::TLWinGoo::broadcast_env(); } else { $ret |= TeXLive::TLUtils::add_symlinks($localtlpdb->root, $localtlpdb->platform(), @@ -1520,7 +1522,9 @@ sub action_path { $ret |= TeXLive::TLUtils::w32_remove_from_path( $localtlpdb->root . "/bin/win32", $winadminmode); - $ret |= TeXLive::TLWinGoo::broadcast_env(); + # ignore this return value, since broadcase_env might return + # nothing in case of errors, and there is no way around it. + # $ret |= TeXLive::TLWinGoo::broadcast_env(); } else { # remove symlinks $ret |= TeXLive::TLUtils::remove_symlinks($localtlpdb->root, @@ -1868,6 +1872,7 @@ sub restore_one_package { $localtlpdb->add_tlpobj($tlpobj); TeXLive::TLUtils::announce_execute_actions("enable", $localtlpdb->get_package($pkg)); + check_announce_format_triggers($pkg); $localtlpdb->save; # TODO_ERRORCHECKING we should check the return values of the # various calls above @@ -10087,7 +10092,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 56458 2020-09-27 22:20:18Z preining $ +$Id: tlmgr.pl 56566 2020-10-06 03:40:54Z preining $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3