← Back to branch summary

~tgc/mailman/2.1-da

« back to all changes in this revision

Viewing changes to Mailman/Queue/IncomingRunner.py

  • Committer: bwarsaw
  • Date: 2003-02-08 07:14:13 UTC
  • Revision ID: vcs-imports@canonical.com-20030208071413-k7j0245jiuwkllk8
Backporting from the trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/Queue/IncomingRunner.py
1
 
# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
 
1
# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
2
2
#
3
3
# This program is free software; you can redistribute it and/or
4
4
# modify it under the terms of the GNU General Public License
126
126
        # used.  Final fallback is the global pipeline.
127
127
        try:
128
128
            pipeline = self._get_pipeline(mlist, msg, msgdata)
129
 
            status = self._dopipeline(mlist, msg, msgdata, pipeline)
130
 
            if status:
131
 
                msgdata['pipeline'] = pipeline
 
129
            msgdata['pipeline'] = pipeline
 
130
            more = self._dopipeline(mlist, msg, msgdata, pipeline)
 
131
            if not more:
 
132
                del msgdata['pipeline']
132
133
            mlist.Save()
133
 
            return status
 
134
            return more
134
135
        finally:
135
136
            mlist.Unlock()
136
137
 
166
167
            except Errors.RejectMessage, e:
167
168
                mlist.BounceMessage(msg, msgdata, e)
168
169
                return 0
 
170
            except:
 
171
                # Push this pipeline module back on the stack, then re-raise
 
172
                # the exception.
 
173
                pipeline.insert(0, handler)
 
174
                raise
169
175
        # We've successfully completed handling of this message
170
176
        return 0