X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=373910c4783393361ca046710cfe06d8f714ca65;hb=6f4cbaedd49063dcb8b1eab75ede9d0a0ac3b71f;hp=85ef0b5573b86649c1e57030c37332d4263e6b7f;hpb=a4baee479f3b5d5351d9f873f1bbf8a62028d044;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 85ef0b55..373910c4 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -37,11 +37,12 @@ import stat import apt_pkg import database import time +import re import email as modemail from dak_exceptions import * from regexes import re_html_escaping, html_escaping, re_single_line_field, \ re_multi_line_field, re_srchasver, re_verwithext, \ - re_parse_maintainer, re_taint_free, re_gpg_uid + re_parse_maintainer, re_taint_free, re_gpg_uid, re_re_mark ################################################################################ @@ -607,11 +608,10 @@ def send_mail (message, filename=""): whitelist = []; whitelist_in = open_file(Cnf["Dinstall::MailWhiteList"]) - RE_mark = re.compile(r'^RE:') try: for line in whitelist_in: - if RE_mark.match(line): - whitelist.append(re.compile(RE_mark.sub("", line.strip(), 1))) + if re_re_mark.match(line): + whitelist.append(re.compile(re_re_mark.sub("", line.strip(), 1))) else: whitelist.append(re.compile(re.escape(line.strip()))) finally: