diff options
author | Norbert Preining <preining@logic.at> | 2008-04-16 10:30:44 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-04-16 10:30:44 +0000 |
commit | 819a736f4a34367ec63da21b0c221cd4749ab0d1 (patch) | |
tree | 9a624ca46063606b55fb7923084f40f5dcd93302 /Master/tlpkg/TeXLive/TLPDB.pm | |
parent | cbcd661b4ec0163299c6494524dd5ad2afbdef38 (diff) |
rework installation
git-svn-id: svn://tug.org/texlive/trunk@7445 c570f23f-e606-0410-a88d-b1316a301751
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); } |