texlive[54629] Master/tlpkg/TeXLive/TLUtils.pm: fixes for tmpdir

commits+preining at tug.org commits+preining at tug.org
Mon Apr 6 12:40:48 CEST 2020


Revision: 54629
          http://tug.org/svn/texlive?view=revision&revision=54629
Author:   preining
Date:     2020-04-06 12:40:48 +0200 (Mon, 06 Apr 2020)
Log Message:
-----------
fixes for tmpdir handling

- back out changes (besides typo fixes) in tl_tempdir
- don't use pattern to File::Temp::tempdir in verify_checksum

Modified Paths:
--------------
    trunk/Master/tlpkg/TeXLive/TLUtils.pm

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2020-04-06 03:09:48 UTC (rev 54628)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2020-04-06 10:40:48 UTC (rev 54629)
@@ -558,10 +558,7 @@
 
 sub tl_tmpdir {
   initialize_global_tmpdir() if (!defined($::tl_tmpdir));
-  # fails on Windows?
-  #my $tmp = File::Temp::tempdir(DIR => $::tl_tmpdir, CLEANUP => 1);
-  # hopefully:
-  my $tmp = File::Temp::tempdir("$::tl_tmpdir/XXXXXXXXX", CLEANUP => 1);
+  my $tmp = File::Temp::tempdir(DIR => $::tl_tmpdir, CLEANUP => 1);
   ddebug("tl_tmpdir: creating tempdir $tmp\n");
   return ($tmp);
 }
@@ -2217,7 +2214,10 @@
     if ($tlchecksum ne $checksum) {
       tlwarn("TLUtils::check_file: checksums differ for $xzfile:\n");
       tlwarn("TLUtils::check_file:   tlchecksum=$tlchecksum, arg=$checksum\n");
-      $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
+      # on Windows passing a pattern creates the tmpdir in PWD
+      # which means that it will be tried to be created on the DVD
+      # $check_file_tmpdir = File::Temp::tempdir("tlcheckfileXXXXXXXX");
+      $check_file_tmpdir = File::Temp::tempdir();
       tlwarn("TLUtils::check_file:   removing $xzfile, "
              . "but saving copy in $check_file_tmpdir\n");
       copy($xzfile, $check_file_tmpdir);



More information about the tex-live-commits mailing list.