Give a better message from scripts/driver on SyntaxError in mm_cfg.py.

2 files changed, 8 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index e2f64e12..b151e779 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,10 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - The message displayed in the browser when accessing a Mailman CGI when
+      mm_cfg.py can't be imported due to some exception other than ImportError
+      has been improved.  (LP: #1760506)
+
     - The reimplementation of DELIVERY_RETRY_WAIT in 2.1.26 could cause extra
       dequeueing and requeueing in the out queue by OutgoingRunner.  This is
       fixed.  (LP: #1762871)
diff --git a/scripts/driver b/scripts/driver
index 67ff0fdf..3c8f831b 100644
--- a/scripts/driver
+++ b/scripts/driver
@@ -1,6 +1,6 @@
 # -*- python -*-
 
-# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -143,7 +143,8 @@ def print_traceback(logfp=None):
         traceback = None
     try:
         from Mailman.mm_cfg import VERSION
-    except ImportError:
+    except:
+        # There could be any exception if mm_cfg.py is not valid python.
         VERSION = '<undetermined>'
 
     # Write to the log file first.
@@ -182,7 +183,7 @@ a description of what happened.  Thanks!
         print '''<p>Please inform the webmaster for this site of this
 problem.  Printing of traceback and other system information has been
 explicitly inhibited, but the webmaster can find this information in the
-Mailman error logs.'''
+Mailman error logs or the web server logs.'''