do not refer to nonexistent pool files in error message

git-svn-id: svn://tug.org/texlive/trunk@43077 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 17 insertions, 4 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 4da1409d324..a8c401afe10 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,6 +1,12 @@
+2017-01-28  Karl Berry  <karl@freefriends.org>
+
+	* tex.ch (texarray),
+	* mf.ch (texarray): don't mention nonexistent pool files in error.
+	Thread from http://tug.org/pipermail/tex-live/2017-January/039647.html.
+
 2016-11-14  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
 
-	* texmfmp.h : Change a condition to support new primitives in
+	* texmfmp.h: Change a condition to support new primitives in
 	eptex and euptex.
 
 2016-11-05  Karl Berry  <karl@tug.org>
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 409cc28298c..5e288afcc11 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-28  Karl Berry  <karl@freefriends.org>
+
+	* com16bit.ch (texarray): don't mention pool files in error message.
+
 2015-07-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/aleph.am: Dependencies for 'make check'.
diff --git a/Build/source/texk/web2c/alephdir/com16bit.ch b/Build/source/texk/web2c/alephdir/com16bit.ch
index 05f4e911004..f19d14e65d0 100644
--- a/Build/source/texk/web2c/alephdir/com16bit.ch
+++ b/Build/source/texk/web2c/alephdir/com16bit.ch
@@ -2177,7 +2177,8 @@ undump_int(x);
 format_debug('string pool checksum')(x);
 if x<>@$ then begin {check that strings are the same}
   wake_up_terminal;
-  wterm_ln('---! ', stringcast(name_of_file+1), ' doesn''t match ', pool_name);
+  wterm_ln('---! ', stringcast(name_of_file+1),
+           'made by different executable version');
   goto bad_fmt;
 end;
 undump_int(x);
diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch
index 7d122e54827..415218f2943 100644
--- a/Build/source/texk/web2c/mf.ch
+++ b/Build/source/texk/web2c/mf.ch
@@ -1812,7 +1812,8 @@ libc_free(base_engine);
 undump_int(x);
 if x<>@$ then begin {check that strings are the same}
   wake_up_terminal;
-  wterm_ln('---! ', stringcast(name_of_file+1), ' doesn''t match ', pool_name);
+  wterm_ln('---! ', stringcast(name_of_file+1),
+           'made by different executable version');
   goto off_base;
 end;
 @<Undump |xord|, |xchr|, and |xprn|@>;
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index 2cc216f1cb2..d02d6e62b29 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -3477,7 +3477,8 @@ undump_int(x);
 format_debug('string pool checksum')(x);
 if x<>@$ then begin {check that strings are the same}
   wake_up_terminal;
-  wterm_ln('---! ', stringcast(name_of_file+1), ' doesn''t match ', pool_name);
+  wterm_ln('---! ', stringcast(name_of_file+1),
+           ' made by different executable version');
   goto bad_fmt;
 end;
 @<Undump |xord|, |xchr|, and |xprn|@>;