summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-28 19:29:43 +0000
committerNorbert Preining <preining@logic.at>2009-07-28 19:29:43 +0000
commit3fb0da12932f7445af2a538cbdaf78a7cb081986 (patch)
treee3efcf11f47b5e73cf666cf5ec9263883f584df5 /Master
parentb07703c29723a38ba270bfe830e2ea7e74e6f472 (diff)
more work on restart
git-svn-id: svn://tug.org/texlive/trunk@14482 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl10
1 files changed, 6 insertions, 4 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 26cfa77fbae..168ec0fe9d7 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1216,7 +1216,7 @@ sub action_backup {
#
sub write_w32_updater {
- my ($rerun_tlmgr_argv, @w32_updated) = @_;
+ my ($restart_tlmgr, @w32_updated) = @_;
my $media = $tlmediasrc->media;
my $mediatlpdb = $tlmediasrc->tlpdb;
# we have to download/copy also the src/doc files if necessary!
@@ -1286,7 +1286,8 @@ sub write_w32_updater {
return 0 if ($opts{"dry-run"}); # nothing else to do
# write the updater script file
open UPDATER, ">$root/temp/run-updater-w32" or die "Cannot create updater: $!";
- # TODO: respawn tlmgr if $rerun_tlmgr_argv is not empty
+ # TODO: respawn tlmgr if $restart_tlmgr is set
+ # TODO: using @::SAVEDARGV
print UPDATER '
@echo off
setlocal enableextensions
@@ -1613,6 +1614,7 @@ 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");
}
@@ -1835,7 +1837,7 @@ sub action_update {
logpackage("update: $pkg ($rev -> $mediarev)");
unlink($unwind_package) if $remove_unwind_container;
# remember successful update
- $update{$pkg} = 1;
+ $updated{$pkg} = 1;
} else {
# install_package returned a scalar, so error.
# now in fact we should do some cleanup, removing files and
@@ -1886,7 +1888,7 @@ sub action_update {
for my $pkg (@CriticalPackagesList) {
if (defined($updated{$pkg})) {
$infra_update_present = 1;
- $infra_update_done &&= $pdated{$pkg};
+ $infra_update_done &&= $updated{$pkg};
}
}