Skip to content

Flags at compile, not match time #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lochiiconnectivity wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Flags at compile, not match time #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/exim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __init__(self, sieve_test, mydir, active_file, homedir):
self.basedir = os.path.join(self.homedir, self.mydir)
self.active = os.path.join(self.homedir, self.active_file)
self.sieve_hdr = '# Sieve filter'
self.sieve_re = re.compile('^' + re.escape(self.sieve_hdr))
self.sieve_re = re.compile('^' + re.escape(self.sieve_hdr), re.S)

# Create our directory if needed
if not os.path.exists(self.basedir):
Expand All @@ -46,15 +46,15 @@ def __init__(self, sieve_test, mydir, active_file, homedir):
try:
# Make sure this is an Exim Sieve filter
script = file(self.active).read()
if re.match(self.sieve_re, script, re.S):
if re.match(self.sieve_re, script):
os.rename(self.active, os.path.join(self.basedir, 'exim'))
self.set_active('exim')
except IOError:
pass


def __setitem__(self, k, v):
if not re.match(self.sieve_re, v, re.S):
if not re.match(self.sieve_re, v):
v = self.sieve_hdr + '\n' + v
FileStorage.FileStorage.__setitem__(self, k, v)

Expand Down