summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/mailowner14
-rwxr-xr-xscripts/owner14
2 files changed, 12 insertions, 16 deletions
diff --git a/scripts/mailowner b/scripts/mailowner
index 3a703a184..fd5894a36 100755
--- a/scripts/mailowner
+++ b/scripts/mailowner
@@ -37,16 +37,14 @@ try:
except IOError:
pass # Oh well - SOL on redirect, errors show thru.
-# Only let one program run at once per list.
-
-# TODO: This *can* fail, and should send back an error message when it does.
-current_list = MailList.MailList(sys.argv[1])
+# Only let one program per list run at any one time. TBD: This *can* fail,
+# and should send back an error message when it does.
+mlist = MailList.MailList(sys.argv[1])
try:
msg = Message.IncomingMessage()
- if not current_list.bounce_processing or not current_list.ScanMessage(msg):
- current_list.DeliverToOwner(msg, current_list.owner)
+ if not mlist.bounce_processing or not mlist.ScanMessage(msg):
+ mlist.DeliverToOwner(msg, mlist.owner)
# Let another process run.
finally:
- current_list.Unlock()
-
+ mlist.Unlock()
diff --git a/scripts/owner b/scripts/owner
index 3a703a184..fd5894a36 100755
--- a/scripts/owner
+++ b/scripts/owner
@@ -37,16 +37,14 @@ try:
except IOError:
pass # Oh well - SOL on redirect, errors show thru.
-# Only let one program run at once per list.
-
-# TODO: This *can* fail, and should send back an error message when it does.
-current_list = MailList.MailList(sys.argv[1])
+# Only let one program per list run at any one time. TBD: This *can* fail,
+# and should send back an error message when it does.
+mlist = MailList.MailList(sys.argv[1])
try:
msg = Message.IncomingMessage()
- if not current_list.bounce_processing or not current_list.ScanMessage(msg):
- current_list.DeliverToOwner(msg, current_list.owner)
+ if not mlist.bounce_processing or not mlist.ScanMessage(msg):
+ mlist.DeliverToOwner(msg, mlist.owner)
# Let another process run.
finally:
- current_list.Unlock()
-
+ mlist.Unlock()