diff options
| author | Karl Berry <karl@freefriends.org> | 2016-06-13 17:52:03 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2016-06-13 17:52:03 +0000 |
| commit | cb42f7dd530ef6ee8b5f84819df7c730a7a99caa (patch) | |
| tree | b56d90117f10ec1f30c0bcd8204d92f86faf48ca /Master/tlpkg/TeXLive | |
| parent | f0ea5904f69c3b0c48a5bf916b9bafe735c21b7b (diff) | |
doc, sync, msgs
git-svn-id: svn://tug.org/texlive/trunk@41437 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 3 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 2b980b2034a..0435ce7113c 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -59,9 +59,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/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 4b3ea16117d..fa4d1abbf5e 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -2756,14 +2756,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) { |