Merge lp:~rashi007/mailman/mailman into lp:mailman

[Rashi Karanpuria]

Switchboard.py changed by solving bug #1165589

[Barry Warsaw (barry)]

Please don't try to fix two bugs with the same merge proposal. It makes it difficult to separate the concerns. I would suggest resubmitting this branch to just fix the documentation bug, and then submitting another branch for the switchboard bug.

review: Needs Fixing

[Barry Warsaw (barry)]

Actually, I'll mark this as accepted since the bug doesn't affect MM3, but the typo is real. Thanks for the contribution!

review: Approve

=== modified file 'src/mailman/core/switchboard.py'
--- src/mailman/core/switchboard.py	2015-01-05 01:40:47 +0000
+++ src/mailman/core/switchboard.py	2015-03-05 05:15:05 +0000
@@ -179,9 +179,9 @@
                 os.rename(bakfile, psvfile)
             else:
                 os.unlink(bakfile)
-        except EnvironmentError:
+        except EnvironmentError as e:
             elog.exception(
-                'Failed to unlink/preserve backup file: %s', bakfile)
+                'Failed to unlink/preserve backup file: %s : %s', bakfile,str(e))
 
     @property
     def files(self):
 
=== modified file 'src/mailman/model/docs/mlist-addresses.rst'
--- src/mailman/model/docs/mlist-addresses.rst	2014-04-28 15:23:35 +0000
+++ src/mailman/model/docs/mlist-addresses.rst	2015-03-05 05:15:05 +0000
@@ -45,8 +45,7 @@
     >>> print(mlist.subscribe_address)
     [e-mail]
 
-The leave (a.k.a. unsubscribe) address is where someone can email to get added
-to the mailing list.  The unsubscribe alias is a synonym for leave, but it's
+The leave (a.k.a. unsubscribe) address is where someone can email to get removed from the mailing list.  The unsubscribe alias is a synonym for leave, but it's 
 deprecated.
 
     >>> print(mlist.leave_address)