revert last change, and simply use flushlog and exit(1)

git-svn-id: svn://tug.org/texlive/trunk@14201 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 16 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 5a59cba67b5..84919d14957 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1322,10 +1322,8 @@ sub do_install_packages {
     } else {
       tlwarn("  install-tl --profile $profile_name [EXTRA-ARGS]\n");
     }
-    # do not continue with installation, but terminate the program
-    # the option to do_cleanup indicates that the containers should
-    # not be removed
-    do_cleanup(1);
+    flushlog();
+    exit(1);
   }
 }
 
@@ -1497,11 +1495,11 @@ sub update_numbers {
 sub flushlog {
   my $fh;
   if (open(LOG,">install-tl.log")) {
-    warn "Writing log file to current working directory.\n";
+    printf "Writing log file to current working directory.\n";
     $fh = \*LOG;
   } else {
     $fh = \*STDERR;
-    warn "Not creating a log file but flushing messages to stderr.\n";
+    printf "Not creating a log file but flushing messages to stderr.\n";
   }
 
   foreach my $l (@::LOGLINES) {
@@ -1523,10 +1521,6 @@ sub check_on_lang_collection_installed {
 
 sub do_cleanup
 {
-  # by default we remove containers
-  my $remove_container = 1;
-  my $arg = shift;
-  $remove_container = 0 if (defined($arg) && $arg);
   # now open the log file and write out the log lines
   # try to open a log file
   # the user could have given the -logfile option in which case all the
@@ -1544,12 +1538,10 @@ sub do_cleanup
     }
   }
 
-  if ($remove_container) {
-    # remove temporary files from TEXDIR/temp
-    if (($media eq "CD") or ($media eq "NET")) {
-      debug("Remove temporary downloaded containers...\n");
-      rmtree("$vars{'TEXDIRW'}/temp") if (-d "$vars{'TEXDIRW'}/temp");
-    }
+  # remove temporary files from TEXDIR/temp
+  if (($media eq "CD") or ($media eq "NET")) {
+    debug("Remove temporary downloaded containers...\n");
+    rmtree("$vars{'TEXDIRW'}/temp") if (-d "$vars{'TEXDIRW'}/temp");
   }
 
   # dump various things to the log file