Barry Warsaw pushed to branch issue260 at mailman / Mailman
Commits:
21267a8f by Mark Sapiro at 2017-04-21T03:41:00+00:00
Remove -admin suffix from Exim router. It's MM 2.1 only.
- - - - -
c975738f by Barry Warsaw at 2017-04-21T18:17:09+00:00
Merge branch 'exim_doc' into 'master'
Remove -admin suffix from Exim router. It's MM 2.1 only.
See merge request !260
- - - - -
547e0ddb by Barry Warsaw at 2017-04-21T13:35:47-07:00
Merge branch 'master' into issue260
- - - - -
0d42af75 by Barry Warsaw at 2017-04-22T07:46:05-07:00
Don't use the user object if there's no preferred address.
- - - - -
2 changed files:
- src/mailman/app/subscriptions.py
- src/mailman/docs/mta.rst
Changes:
=====================================
src/mailman/app/subscriptions.py
=====================================
--- a/src/mailman/app/subscriptions.py
+++ b/src/mailman/app/subscriptions.py
@@ -201,9 +201,12 @@ class SubscriptionWorkflow(_SubscriptionWorkflowCommon):
assert self.user is not None and self.address is not None, (
'Insane sanity check results')
# Is this subscriber already a member?
- if self.mlist.is_subscribed(
- self.user if self.which is WhichSubscriber.user
- else self.address):
+ if (self.which is WhichSubscriber.user and
+ self.user.preferred_address is not None):
+ subscriber = self.user
+ else:
+ subscriber = self.address
+ if self.mlist.is_subscribed(subscriber):
raise AlreadySubscribedError(
self.mlist.fqdn_listname,
self.address.email,
=====================================
src/mailman/docs/mta.rst
=====================================
--- a/src/mailman/docs/mta.rst
+++ b/src/mailman/docs/mta.rst
@@ -255,7 +255,7 @@ installation.
domains = +mm_domains
require_files = MM3_LISTCHK
local_part_suffix_optional
- local_part_suffix = -admin : \
+ local_part_suffix = \
-bounces : -bounces+* : \
-confirm : -confirm+* : \
-join : -leave : \
View it on GitLab:
https://gitlab.com/mailman/mailman/compare/84990b66f2db1bd8486b8d439909fcbec3ff9678...0d42af7566ce3376958e2b25d7b50b2440fdd560
---
View it on GitLab:
https://gitlab.com/mailman/mailman/compare/84990b66f2db1bd8486b8d439909fcbec3ff9678...0d42af7566ce3376958e2b25d7b50b2440fdd560
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
