tl-update-nsis: can't remove tlpobj/ dir here.

tl-update-tlcritical: remove it here instead, after running makensis.
tltestnet: new --rebuild option to update test repository.


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

1 files changed, 4 insertions, 9 deletions

diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis
index 7b41c32d9be..0b121f48228 100755
--- a/Master/tlpkg/bin/tl-update-nsis
+++ b/Master/tlpkg/bin/tl-update-nsis
@@ -46,14 +46,11 @@ sub main {
   push(@allfiles, $texliveinfra->all_files);
   push(@allfiles, $texliveinfraw32->all_files) if defined $texliveinfraw32;
   
-  # create the tlpobj files, but if we have to create the tlpobj/ dir,
-  # don't leave it around after.
+  # create the tlpobj files, and directory if necessary.
   my $tlpobjdir = "$InfraLocation/tlpobj";
   my $abs_tlpobjdir = "$Master/$tlpobjdir";
-  my $rm_abs_tlpobjdir = 0;
   if (! -d $abs_tlpobjdir) {
     &TeXLive::TLUtils::mkdirhier($abs_tlpobjdir);
-    $rm_abs_tlpobjdir = 1;
   }
   my $rev = 0; # get the highest rev of all our packages
   for my $p ($texliveinfra, $texliveinfraw32) {
@@ -69,11 +66,6 @@ sub main {
     }
   }
 
-  # remove the tlpobj/ dir if we created it.
-  if ($rm_abs_tlpobjdir) {
-    TeXLive::TLUtils::rmtree($abs_tlpobjdir);
-  }
-  
   my %dirtofiles;
   for my $f (@allfiles) {
     if ($f !~ m!/!) {
@@ -177,6 +169,9 @@ inability to overwrite open files, and for disaster recovery. It
 contains the tlmgr-related infrastructure files.
 L<http://tug.org/texlive/tlmgr.html> explains more.
 
+If necessary, this creates a C<.../tlpkg/tlpobj/> subdirectory in the
+current hierarchy for C<makensis> to read (so it is not removed).
+
 This is invoked by the C<tl-update-tlcritical> script, along with the
 sibling C<tl-makeself-from-tlnet> which creates a similar disaster
 recovery executable for Unix.