2 files changed, 7 insertions, 9 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) {