diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-26 21:52:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-26 21:52:14 +0000 |
commit | 3a5f71a67a4fa2028f36f8de5057f63f6c2a0a0d (patch) | |
tree | 62ae1b83834c8aac320a8abfd37f6a7ee40ba292 /Build/source/texk | |
parent | 749139a4326728740295993da7126d9545f3af2c (diff) |
sync
git-svn-id: svn://tug.org/texlive/trunk@41545 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLConfig.pm | 5 | ||||
-rw-r--r-- | Build/source/texk/tests/TeXLive/TLUtils.pm | 11 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm index 767a173e6e5..c1f6bbb1ff8 100644 --- a/Build/source/texk/tests/TeXLive/TLConfig.pm +++ b/Build/source/texk/tests/TeXLive/TLConfig.pm @@ -5,7 +5,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 40652 $'; +my $svnrev = '$Revision: 41437 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -58,9 +58,6 @@ $ReleaseYear = 2016; # Generally not tested. $MinRelease = 2016; -# users can NOT upgrade due to internal changes, force a full installation -#$MinRelease = $ReleaseYear; - # Meta Categories do not ship files, but only call for other packages. our @MetaCategories = qw/Collection Scheme/; our $MetaCategoriesRegexp = '(Collection|Scheme)'; diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm index ce56842e4ad..d86bb1e7423 100644 --- a/Build/source/texk/tests/TeXLive/TLUtils.pm +++ b/Build/source/texk/tests/TeXLive/TLUtils.pm @@ -5,7 +5,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 41175 $'; +my $svnrev = '$Revision: 41437 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -2755,14 +2755,15 @@ sub _create_config_files { my @lines = (); my $usermode = $tlpdb->setting( "usertree" ); if (-r "$root/$headfile") { - # we might be in user mode and do *not* want that the generation - # of the configuration file just boils out. open (INFILE, "<$root/$headfile") || die "open($root/$headfile) failed, but -r ok: $!"; @lines = <INFILE>; close (INFILE); - } else { - die ("Giving up.") if (!$usermode); + } elsif (!$usermode) { + # we might be in user mode and then do *not* want the generation + # of the configuration file to just bail out. + tldie ("TLUtils::_create_config_files: giving up, unreadable: " + . "$root/$headfile\n") } push @lines, @$tlpdblinesref; if (defined($localconf) && -r $localconf) { diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 8d322d5b3b4..a317afe661a 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: fmtutil.pl 40678 2016-04-22 13:16:07Z siepo $ +# $Id: fmtutil.pl 41529 2016-06-23 03:12:14Z preining $ # fmtutil - utility to maintain format files. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -24,11 +24,11 @@ BEGIN { TeX::Update->import(); } -my $svnid = '$Id: fmtutil.pl 40678 2016-04-22 13:16:07Z siepo $'; -my $lastchdate = '$Date: 2016-04-22 15:16:07 +0200 (Fri, 22 Apr 2016) $'; +my $svnid = '$Id: fmtutil.pl 41529 2016-06-23 03:12:14Z preining $'; +my $lastchdate = '$Date: 2016-06-23 05:12:14 +0200 (Thu, 23 Jun 2016) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 40678 $'; +my $svnrev = '$Revision: 41529 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "r$svnrev ($lastchdate)"; @@ -91,7 +91,9 @@ if (win32()) { our $texmfconfig = $TEXMFCONFIG; our $texmfvar = $TEXMFVAR; our $alldata; -our %opts = ( quiet => 0 ); +# command line options with defaults +# 20160623 - switch to turn on strict mode +our %opts = ( quiet => 0 , strict => 1 ); # make a list of all the commands (as opposed to options), so we can # reasonably check for multiple commands being (erroneously) given. @@ -117,7 +119,7 @@ our @cmdline_options = ( # in same order as help message "no-error-if-no-format", "nohash", "recorder", - "strict", + "strict!", "quiet|silent|q", "catcfg", "dolinks", @@ -1280,9 +1282,9 @@ Options: --no-error-if-no-engine=ENGINE1,ENGINE2,... exit successfully even if a required engine is missing, if it is included in the list. + --no-strict don't exit with bad status if a format fails to build --nohash don't update ls-R files --recorder pass the -recorder option and save .fls files - --strict exit with bad status if a format fails to build --quiet be silent --catcfg (does nothing, exists for compatibility) --dolinks (does nothing, exists for compatibility) |