------------------------------------------------------------
revno: 1751
fixes bug: https://launchpad.net/bugs/1760506
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Fri 2018-04-13 09:31:18 -0700
message:
  Give a better message from scripts/driver on SyntaxError in mm_cfg.py.
modified:
  NEWS
  scripts/driver


--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1

Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'NEWS'
--- NEWS	2018-04-11 03:34:48 +0000
+++ NEWS	2018-04-13 16:31:18 +0000
@@ -18,6 +18,10 @@
 
   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)

=== modified file 'scripts/driver'
--- scripts/driver	2013-04-07 05:54:18 +0000
+++ scripts/driver	2018-04-13 16:31:18 +0000
@@ -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 @@
         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 = '&lt;undetermined&gt;'
 
     # Write to the log file first.
@@ -182,7 +183,7 @@
         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.'''
 
 
 

_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: 
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to