diff options
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 35791dbf557..abbc75ef88e 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -1752,7 +1752,6 @@ sub action_update { # # we first collect the list of packages to be actually updated or installed my %updated; - my %w32_updated; # win32 special packages that need the updater batch script my @new; my @addlines; @@ -1807,12 +1806,7 @@ sub action_update { } my $mediarev = $mediatlp->revision; if ($rev < $mediarev) { - # w32 specials are treated as other packages for --list - if (win32() && !$opts{"list"} && ($pkg =~ m/$CriticalPackagesRegexp/)) { - $w32_updated{$pkg} = 0; # will be changed to one on successful update - } else { - $updated{$pkg} = 0; # will be changed to one on successful update - } + $updated{$pkg} = 0; # will be changed to one on successful update } elsif ($rev > $mediarev) { if ($::machinereadable) { push @addlines, @@ -1824,7 +1818,6 @@ sub action_update { } } my @updated = sort keys %updated; - my @w32_updated = sort keys %w32_updated; for my $i (sort @new) { debug("$i new package\n"); } @@ -1837,8 +1830,6 @@ sub action_update { # script my $totalnr = $#updated + 1; my @alltodo = @updated; - # for size calculation we also want w32 special packages - push @alltodo, @w32_updated; my $nrupdated = 0; my $currnr = 1; @@ -1996,6 +1987,8 @@ sub action_update { # foreach my $pkg (@inst_packs, @inst_colls, @inst_schemes) { + # skip this loop if infra update on w32 + last if (win32() && $opts{"self"}); next if ($pkg =~ m/^00texlive/); my $tlp = $localtlpdb->get_package($pkg); # we checked already that this package is present! @@ -2158,9 +2151,9 @@ sub action_update { } # infra update and tlmgr restart on win32 is done by the updater batch script - if (win32() && !$opts{"list"} && @w32_updated) { + if (win32() && !$opts{"list"} && @critical) { info("Preparing TeX Live infrastructure update...\n"); - my $ret = write_w32_updater($restart_tlmgr, @w32_updated); + my $ret = write_w32_updater($restart_tlmgr, @critical); if ($ret) { tlwarn ("Aborting infrastructure update.\n"); $restart_tlmgr = 0 if ($opts{"dry-run"}); @@ -2187,7 +2180,7 @@ sub action_update { return; } - if (!(@new || @updated || @w32_updated) && ($tlmediasrc->media ne "NET") && $opts{"all"}) { + if (!(@new || @updated) && ($tlmediasrc->media ne "NET") && $opts{"all"}) { # for all but net updates we warn if nothing is updated tlwarn("\nNothing to update.\n"); tlwarn("\nYour installation is set up to look on the disk for updates.\n"); |