Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
日本語対応Mailman POEM版
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yasuhito FUTATSUKI
日本語対応Mailman POEM版
Commits
962c9d48
Commit
962c9d48
authored
8 years ago
by
Jim Popovitch
Browse files
Options
Downloads
Patches
Plain Diff
Send bounce messages from virtual domains not siteowner
parent
e4302599
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Mailman/Bouncer.py
+3
-4
3 additions, 4 deletions
Mailman/Bouncer.py
with
3 additions
and
4 deletions
Mailman/Bouncer.py
+
3
−
4
View file @
962c9d48
...
...
@@ -224,7 +224,7 @@ class Bouncer:
# it was of dubious value). However, we'll provide empty, strange, or
# meaningless strings for the unused %()s fields so that the language
# translators don't have to provide new templates.
site
owner
=
Utils
.
get_site_email
(
self
.
host_name
)
owner
addr
=
self
.
GetOwnerEmail
(
)
text
=
Utils
.
maketext
(
'
bounce.txt
'
,
{
'
listname
'
:
self
.
real_name
,
...
...
@@ -233,11 +233,10 @@ class Bouncer:
'
did
'
:
_
(
'
disabled
'
),
'
but
'
:
''
,
'
reenable
'
:
''
,
'
owneraddr
'
:
site
owner
,
'
owneraddr
'
:
owne
radd
r
,
},
mlist
=
self
)
subject
=
_
(
'
Bounce action notification
'
)
umsg
=
Message
.
UserNotification
(
self
.
GetOwnerEmail
(),
siteowner
,
subject
,
umsg
=
Message
.
UserNotification
(
owneraddr
,
owneraddr
,
subject
,
lang
=
self
.
preferred_language
)
# BAW: Be sure you set the type before trying to attach, or you'll get
# a MultipartConversionError.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment