diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 135e5856104..fc8d7b1ac58 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -181,18 +181,24 @@ sub from_file { } else { $self->root($root_from_path); } + my $retfh; if ($path =~ /^(http|ftp):\/\//) { tllog($::LOG_DDDEBUG, "TLPDB.pm: trying to initialize from $path\n"); - open(TMP, "wget -q --output-document=- $path|") - || die("Cannot open tlpdb file: $path"); + $retfh = TeXLive::TLUtils::download_file($path, "|"); + #open(TMP, "wget -q --output-document=- $path|") + # || die("Cannot open tlpdb file: $path"); + if (!$retfh) { + die("Cannot open tlpdb file: $path"); + } } else { open(TMP,"<$path") || die("Cannot open tlpdb file: $path"); + $retfh = \*TMP; } my $found = 0; do { my $tlp = TeXLive::TLPOBJ->new; tllog($::LOG_DDDEBUG, "creating tlp from $path...\n"); - $found = $tlp->from_fh(\*TMP,1); + $found = $tlp->from_fh($retfh,1); if ($found) { $self->add_tlpobj($tlp); } |