From: Joerg Jaspert Date: Fri, 25 Apr 2008 21:41:10 +0000 (+0200) Subject: Merge upstream X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3bb635cd8b8d524e808d537f469031125dba86fc;hp=3c9c18216b0961a66bd76b895b68cb5701e6bb40;p=dak.git Merge upstream --- diff --git a/ChangeLog b/ChangeLog index 7666bdba..e227e68d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,11 @@ * daklib/utils.py (build_file_list): Deal with "Format 3 style" Format lines (ie. those having extra text appended). +2008-04-19 Joerg Jaspert + + * dak/process_unchecked.py (check_files): Sanity check the + provides field, which closes #472783 + 2008-04-18 Joerg Jaspert * config/debian/dak.conf: Add mapping stable-proposed-updates diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 055f7ee8..498eb49f 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -44,6 +44,7 @@ re_valid_pkg_name = re.compile(r"^[\dA-Za-z][\dA-Za-z\+\-\.]+$") re_changelog_versions = re.compile(r"^\w[-+0-9a-z.]+ \([^\(\) \t]+\)") re_strip_revision = re.compile(r"-([^-]+)$") re_strip_srcver = re.compile(r"\s+\(\S+\)$") +re_spacestrip = re.compile('(\s)') ################################################################################ @@ -461,6 +462,16 @@ def check_files(): if depends == '': reject("%s: Depends field is empty." % (file)) + # Sanity-check the Provides field + provides = re_spacestrip.sub('', control.Find("Provides")) + if provides == '': + reject("%s: Provides field is empty." % (file)) + prov_list = provides.split(",") + for prov in prov_list: + if not re_valid_pkg_name.match(prov): + reject("%s: Invalid Provides field content %s." % (file, prov)) + + # Check the section & priority match those given in the .changes (non-fatal) if control.Find("Section") and files[file]["section"] != "" and files[file]["section"] != control.Find("Section"): reject("%s control file lists section as `%s', but changes file has `%s'." % (file, control.Find("Section", ""), files[file]["section"]), "Warning: ")