aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2009-12-30 13:39:08 -0800
committerMark Sapiro <mark@msapiro.net>2009-12-30 13:39:08 -0800
commit034ffbb9dc7dbee5c7e9ed73ebf346a04252b4bd (patch)
treef53fed0c07a7130990527b8b5d0acd34bea9344e
parent30ed3639227be2b174be06d69a43ba73cd205422 (diff)
downloadmailman2-034ffbb9dc7dbee5c7e9ed73ebf346a04252b4bd.tar.gz
mailman2-034ffbb9dc7dbee5c7e9ed73ebf346a04252b4bd.tar.xz
mailman2-034ffbb9dc7dbee5c7e9ed73ebf346a04252b4bd.zip
Fixed a bug where check_perms would throw an OSError if an entry in
Mailman's lists/ directory was not a directory. Bug #265613.
-rw-r--r--NEWS3
-rwxr-xr-xbin/check_perms4
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6b18d609..441dd342 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Fixed a bug where check_perms would throw an OSError if an entry in
+ Mailman's lists/ directory was not a directory. Bug #265613.
+
- Fixed a bug where a message with an Approved: header held by a handler
that precedes Approve (SpamDetect by default) would not have the
Approved: header removed if the held message was approved. Bug #501739.
diff --git a/bin/check_perms b/bin/check_perms
index 3c8d3768..137ebfb9 100755
--- a/bin/check_perms
+++ b/bin/check_perms
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -340,6 +340,8 @@ def checkdata():
print _('checking permissions on list data')
# BAW: This needs to be converted to the Site module abstraction
for dir in os.listdir(mm_cfg.LIST_DATA_DIR):
+ if not os.path.isdir(os.path.join(mm_cfg.LIST_DATA_DIR, dir)):
+ continue
for file in checkfiles:
path = os.path.join(mm_cfg.LIST_DATA_DIR, dir, file)
if STATE.VERBOSE: