GNU Mailman

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

  1. mailman
  2. Merge into 3.0
Proposed by Rashi Karanpuria
Status: Merged
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~rashi007/mailman/mailman
Merge into: lp:mailman
Diff against target: 29 lines (+3/-4)
2 files modified
src/mailman/core/switchboard.py (+2/-2)
src/mailman/model/docs/mlist-addresses.rst (+1/-2)
To merge this branch: bzr merge lp:~rashi007/mailman/mailman
Reviewer Review Type Date Requested Status
Barry Warsaw Approve
Review via email: mp+251870@code.launchpad.net

Description of the change

Switchboard.py changed by solving bug #1165589

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

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
Revision history for this message
Barry Warsaw (barry) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/core/switchboard.py'
2--- src/mailman/core/switchboard.py 2015-01-05 01:40:47 +0000
3+++ src/mailman/core/switchboard.py 2015-03-05 05:15:05 +0000
4@@ -179,9 +179,9 @@
5 os.rename(bakfile, psvfile)
6 else:
7 os.unlink(bakfile)
8- except EnvironmentError:
9+ except EnvironmentError as e:
10 elog.exception(
11- 'Failed to unlink/preserve backup file: %s', bakfile)
12+ 'Failed to unlink/preserve backup file: %s : %s', bakfile,str(e))
13
14 @property
15 def files(self):
16
17=== modified file 'src/mailman/model/docs/mlist-addresses.rst'
18--- src/mailman/model/docs/mlist-addresses.rst 2014-04-28 15:23:35 +0000
19+++ src/mailman/model/docs/mlist-addresses.rst 2015-03-05 05:15:05 +0000
20@@ -45,8 +45,7 @@
21 >>> print(mlist.subscribe_address)
22 _xtest-subscribe@example.com
23
24-The leave (a.k.a. unsubscribe) address is where someone can email to get added
25-to the mailing list. The unsubscribe alias is a synonym for leave, but it's
26+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
27 deprecated.
28
29 >>> print(mlist.leave_address)