X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=a6660ae1b9e291f89306dbc4ab1b032a09491ba5;hb=3f19ec37baba79ae02d61587867400521fd2baa6;hp=2b243b85f9d6e19796dd7ec46e33c7f055cefdc4;hpb=c07d8e9ee4c188368fa64dc1f4db0f98d2c9f863;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 2b243b85..a6660ae1 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -47,6 +47,7 @@ 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 +from formats import parse_format, validate_changes_format from srcformats import get_format_from_string from collections import defaultdict @@ -526,9 +527,9 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"): if not changes.has_key(field): raise NoFilesFieldError - # Get SourceFormat object for this Format and validate it - format = get_format_from_string(changes.get['format']) - format.validate_format(is_a_dsc=is_a_dsc, field=field) + # Validate .changes Format: field + if not is_a_dsc: + validate_changes_format(parse_format(changes['format']), field) includes_section = (not is_a_dsc) and field == "files" @@ -1505,5 +1506,3 @@ apt_pkg.ReadConfigFileISC(Cnf,default_config) if which_conf_file() != default_config: apt_pkg.ReadConfigFileISC(Cnf,which_conf_file()) - -###############################################################################