texlive[47813] Master/tlpkg/TeXLive: more ssh fixes

[commits+preining at tug.org]

Revision: 47813
          http://tug.org/svn/texlive?view=revision&revision=47813
Author:   preining
Date:     2018-05-23 04:41:17 +0200 (Wed, 23 May 2018)
Log Message:
-----------
more ssh fixes

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

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2018-05-23 02:41:08 UTC (rev 47812)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2018-05-23 02:41:17 UTC (rev 47813)
@@ -1835,6 +1835,7 @@
     } elsif (&media eq 'NET') {
       $container = "$root/$Archive/$pkg.$DefaultContainerExtension";
     }
+    debug("TLPDB::not_virtual_install_package: trying to install $container\n");
     $self->_install_data ($container, $reloc, \@installfiles, $totlpdb, $tlpobj->containersize, $tlpobj->containerchecksum)
       || return(0);
     # if we are installing from local_compressed or NET we have to fetch the respective

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-05-23 02:41:08 UTC (rev 47812)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2018-05-23 02:41:17 UTC (rev 47813)
@@ -2176,7 +2176,7 @@
   $containerfile_quote = "\"$containerfile\"";
   $tarfile_quote = "\"$tarfile\"";
   $target_quote = "\"$target\"";
-  if ($what =~ m,^(https?|ftp)://,) {
+  if ($what =~ m,^(https?|ftp)://, || $what =~ m,^[^@]*@[^:]*:,) {
     # we are installing from the NET
     # check for the presence of $what in $tempdir
     if (-r $containerfile) {