Revert "don't subscribe club reps to csc-general"
This reverts commit fa05c4ad4a
.
This commit is contained in:
parent
2ee9511337
commit
5351cf8aee
|
@ -111,16 +111,14 @@ class AddMemberTransaction(AbstractTransaction):
|
||||||
yield 'failed_to_send_welcome_message: ' + str(err)
|
yield 'failed_to_send_welcome_message: ' + str(err)
|
||||||
break
|
break
|
||||||
|
|
||||||
# don't subscribe club reps to csc-general
|
try:
|
||||||
if self.terms:
|
user.subscribe_to_mailing_list(self.new_member_list)
|
||||||
try:
|
yield 'subscribe_to_mailing_list'
|
||||||
user.subscribe_to_mailing_list(self.new_member_list)
|
except UserAlreadySubscribedError:
|
||||||
yield 'subscribe_to_mailing_list'
|
pass
|
||||||
except UserAlreadySubscribedError:
|
except Exception as err:
|
||||||
pass
|
logger.warning('subscribe_to_mailing_list failed:\n' + traceback.format_exc())
|
||||||
except Exception as err:
|
yield 'failed_to_subscribe_to_mailing_list: ' + str(err)
|
||||||
logger.warning('subscribe_to_mailing_list failed:\n' + traceback.format_exc())
|
|
||||||
yield 'failed_to_subscribe_to_mailing_list: ' + str(err)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.mail_srv.announce_new_user(user, self.finished_operations)
|
self.mail_srv.announce_new_user(user, self.finished_operations)
|
||||||
|
|
Loading…
Reference in New Issue