summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-04-15 00:14:30 +0000
committerNorbert Preining <preining@logic.at>2017-04-15 00:14:30 +0000
commitcd1f2edf9fd5e822f2b06be0ba4cac051339c89b (patch)
tree2776421767f217ad7bff1481cd39d427abfa705c
parent06ff316d691d3668a7098e066764d138d11fa361 (diff)
fix closed package log file, change debug to tlwarn
git-svn-id: svn://tug.org/texlive/trunk@43799 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl19
1 files changed, 11 insertions, 8 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 50fd3298881..ec780c45b5f 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -595,8 +595,8 @@ for the full story.\n";
#
# Try to open the packagelog file, but do NOT die when that does not work
if (!open(PACKAGELOG, ">>$packagelogfile")) {
- debug("Cannot open package log file $packagelogfile for appending\n");
- debug("Will not log package installation/removal/update for that run\n");
+ tlwarn("Cannot open package log file $packagelogfile for appending\n");
+ tlwarn("Will not log package installation/removal/update for that run\n");
$packagelogfile = "";
}
@@ -630,6 +630,12 @@ for the full story.\n";
my $ret = execute_action($action, @ARGV);
+ # close the special log file
+ if ($packagelogfile && !$::gui_mode) {
+ info("$prg: package log updated: $packagelogfile\n") if $packagelogged;
+ close(PACKAGELOG);
+ }
+
# F_ERROR stops processing immediately, and prevents postactions from
# being run (e.g., untar fails). F_WARNING continues on, including
# postactions (e.g., user tries to install 10 packages and the
@@ -718,12 +724,6 @@ sub execute_action {
$run_post = 0;
}
- # close the special log file
- if ($packagelogfile && !$::gui_mode) {
- info("$prg: package log updated: $packagelogfile\n") if $packagelogged;
- close(PACKAGELOG);
- }
-
return ($ret) if (!$run_post);
# run external programs.
@@ -6519,6 +6519,9 @@ sub action_shell {
print give_version(), "\n";
} elsif ($cmd =~ m/^(quit|end|byebye)$/i) {
return $F_OK;
+ } elsif ($cmd eq "setup-location") {
+ my $dest = shift @args;
+ print "ERROR not implemented: $cmd\n";
} elsif ($cmd eq "set") {
my $key = shift @args;
my $val = shift @args;