summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-29 16:04:35 +0000
committerKarl Berry <karl@freefriends.org>2016-06-29 16:04:35 +0000
commit2597736aa760a011c7f8f0b9061139ba1131ac73 (patch)
tree12b69a6bb1bbc4d031d196c99b1e535b6f2097c6 /Master/tlpkg/TeXLive
parent4cba201476cfd2785bcb999d7dd7eed0abcbdeff (diff)
doc/test updates.
dvips.texi: remov fmtutil.pl: return status, --no-strict wording. updmap.pl: main output first. TLPDB.pm (not_virtual_install_package): variables in diagnostics. tl-update-containers: multi-arg xsystem call. git-svn-id: svn://tug.org/texlive/trunk@41566 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm13
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 48f95e6f260..32119ea0f75 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -243,7 +243,8 @@ sub remove_tlpobj {
The C<from_file> function initializes the C<TLPDB> if the root was not
given at generation time. See L<TLPDB::new> for more information.
-It returns the actual number of packages (TLPOBJs) read from C<$filename>.
+It returns the actual number of packages (TLPOBJs) read from
+C<$filename>, and zero if there are problems (and gives warnings).
=cut
@@ -290,9 +291,8 @@ sub from_file {
} elsif (-d "$rootpath/$Archive") {
$media = 'local_compressed';
} else {
- # we cannot find the right type, return undefined, that should
- # make people notice
- tlwarn("Cannot determine type of tlpdb!\n");
+ # we cannot find the right type, return zero, hope people notice
+ tlwarn("Cannot determine type of tlpdb from $rootpath!\n");
return 0;
}
}
@@ -1706,9 +1706,10 @@ sub not_virtual_install_package {
# we have to write out the tlpobj file since it is contained in the
# archives (.tar.xz) but at DVD install time we don't have them
my $tlpod = $totlpdb->root . "/tlpkg/tlpobj";
- mkdirhier( $tlpod );
+ mkdirhier($tlpod);
my $count = 0;
- until (open(TMP,">$tlpod/".$tlpobj->name.".tlpobj")) {
+ my $tlpobj_file = ">$tlpod/" . $tlpobj->name . ".tlpobj";
+ until (open(TMP, $tlpobj_file)) {
# The open might fail for no good reason on Windows.
# Try again for a while, but not forever.
if ($count++ == 100) { die "$0: open($tlpobj_file) failed: $!"; }