texlive[47846] Master/tlpkg/TeXLive/TLUtils.pm:
commits+karl at tug.org
commits+karl at tug.org
Sat May 26 17:58:41 CEST 2018
Revision: 47846
http://tug.org/svn/texlive?view=revision&revision=47846
Author: karl
Date: 2018-05-26 17:58:41 +0200 (Sat, 26 May 2018)
Log Message:
-----------
(repository_to_array): die if passed empty string,
since this should never happen. Noticed in report
from Bernhard Waldbrunner, 22 May 2018 20:26:15.
Also, omit \n from most die statements, for more context.
Modified Paths:
--------------
trunk/Master/tlpkg/TeXLive/TLUtils.pm
Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm 2018-05-26 15:44:25 UTC (rev 47845)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm 2018-05-26 15:58:41 UTC (rev 47846)
@@ -877,7 +877,7 @@
} elsif (defined wantarray) {
return(0);
} else {
- die "$0: $reterror\n";
+ die "$0: $reterror";
}
}
}
@@ -1124,7 +1124,7 @@
chmod $mode, "$outfile";
while ($read = sysread (IN, $buffer, $blocksize)) {
- die "read($infile) failed: $!\n" unless defined $read;
+ die "read($infile) failed: $!" unless defined $read;
$offset = 0;
while ($read) {
$written = syswrite (OUT, $buffer, $read, $offset);
@@ -2399,6 +2399,8 @@
if ($::opt_verbosity >= 1) {
require Data::Dumper;
+ use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys
+ $Data::Dumper::Purity); # -w pain
$Data::Dumper::Indent = 1;
$Data::Dumper::Sortkeys = 1; # stable output
$Data::Dumper::Purity = 1; # recursive structures must be safe
@@ -3553,7 +3555,8 @@
# open log file if one was requested.
if ($opt_logfile) {
- open(TLUTILS_LOGFILE, ">$opt_logfile") || die "open(>$opt_logfile) failed: $!\n";
+ open(TLUTILS_LOGFILE, ">$opt_logfile")
+ || die "open(>$opt_logfile) failed: $!\n";
$::LOGFILE = \*TLUTILS_LOGFILE;
$::LOGFILENAME = $opt_logfile;
}
@@ -4184,7 +4187,7 @@
# check whether files exist
if ($mustexist) {
foreach my $file (keys %files) {
- die "File \"$file\" doesn't exist.\n" if (! -f $file);
+ die "mktexupd: exec file does not exist: $file" if (! -f $file);
}
}
my $delim= (&win32)? ';' : ':';
@@ -4302,10 +4305,19 @@
}
+=item C<repository_to_array($r)>
+
+Return hash of tags to urls for space-separated list of repositories
+passed in C<$r>. If passed undef or empty string, die.
+
+=cut
+
sub repository_to_array {
my $r = shift;
my %r;
- my @repos = split ' ', $r;
+ die "internal error, repository_to_array passed nothing (caller="
+ . caller . ")";
+ my @repos = split (' ', $r);
if ($#repos == 0) {
# only one repo, this is the main one!
$r{'main'} = $repos[0];
@@ -4398,7 +4410,7 @@
# that didn't work out, use home-grown json
if ($envdefined) {
# environment asks for JSON but cannot be loaded, die!
- tldie("env variable TL_JSONMODE request JSON module but cannot be load!\n");
+ tldie("envvar TL_JSONMODE request JSON module but cannot be loaded!\n");
}
$jsonmode = "texlive";
debug("texlive json module used!\n");
More information about the tex-live-commits
mailing list