X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=c3e4dbb32169b9aa4c8140943f860cb64593168f;hb=3b50b545815298b77b8eb68930acb6fde01ea4d4;hp=6ec92f89ad7e03d60a2e793829333b3907128346;hpb=4bb08a11d2dcf16dfe48109bcfe749d0dccab7d9;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 6ec92f89..c3e4dbb3 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -36,6 +36,7 @@ import stat import apt_pkg import time import re +import string import email as modemail import subprocess @@ -44,7 +45,8 @@ from dak_exceptions import * from textutils import fix_maintainer from regexes import re_html_escaping, html_escaping, re_single_line_field, \ re_multi_line_field, re_srchasver, re_taint_free, \ - re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource + re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource, \ + re_is_orig_source from formats import parse_format, validate_changes_format from srcformats import get_format_from_string @@ -1362,7 +1364,7 @@ def check_signature (sig_filename, data_filename="", keyrings=None, autofetch=No # Finally ensure there's not something we don't recognise known_keywords = dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="", SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="", - NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="") + NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="",POLICY_URL="") for keyword in keywords.keys(): if not known_keywords.has_key(keyword):