X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=daklib%2Fregexes.py;h=3305568285ef277df1ce8c9d03ce3c617ac4a3af;hp=47e6ab2c9f255402d23878eccfb0be903abf1761;hb=4ea76bfffad73823865a07ed6007f2fcbc31ffd6;hpb=b4022bd29f8d8b8b6923c943071f7e9849c9d244 diff --git a/daklib/regexes.py b/daklib/regexes.py old mode 100755 new mode 100644 index 47e6ab2c..33055682 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -34,8 +34,6 @@ re_isanum = re.compile (r"^\d+$") #: Looking for the default reply re_default_answer = re.compile(r"\[(.*)\]") -#: Used in build_summaries to make changes output look better -re_fdnic = re.compile(r"\n\n") #: Detect a binnmu re_bin_only_nmu = re.compile(r"\+b\d+$") @@ -44,30 +42,23 @@ re_comments = re.compile(r"\#.*") #: To ignore comment and whitespace lines. re_whitespace_comment = re.compile(r"^\s*(#|$)") re_no_epoch = re.compile(r"^\d+\:") -re_no_revision = re.compile(r"-[^-]+$") -re_arch_from_filename = re.compile(r"/binary-[^/]+/") re_extract_src_version = re.compile (r"(\S+)\s*\((.*)\)") re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$") -orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2)" -re_orig_source_ext = re.compile(orig_source_ext_re + "$") -re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2)|diff\.gz|tar\.(?:gz|bz2)|dsc)$") +orig_source_ext_re = r"orig(?:-[a-zA-Z0-9-]+)?\.tar\.(?:gz|bz2|xz)(?:\.asc)?" +file_source_ext_re = "(" + orig_source_ext_re + r"|(?:debian\.)?tar\.(?:gz|bz2|xz)|diff\.gz)" +re_source_ext = re.compile("(" + file_source_ext_re + r"|dsc)$") re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern) -re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2)$") -#re_is_orig_source = re.compile (r"(.+)_(.+?)\.(?:orig\.)?tar\.(?:gz|bz2)$") re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)") re_multi_line_field = re.compile(r"^\s(.*)") re_taint_free = re.compile(r"^[-+~/\.\w]+$") re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\>]+)\>") -re_gpg_uid = re.compile('^uid.*<([^>]*)>') re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$") re_verwithext = re.compile(r"^(\d+)(?:\.(\d+))(?:\s+\((\S+)\))?$") -re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$") - html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'} re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys()))) @@ -87,23 +78,11 @@ re_version = re.compile('^(.*)\((.*)\)') re_newlinespace = re.compile('\n') re_spacestrip = re.compile('(\s)') -# From import_archive.py -re_arch_from_filename = re.compile(r"binary-[^/]+") - -# From import_ldap_fingerprints.py -re_gpg_fingerprint = re.compile(r"^\s+Key fingerprint = (.*)$", re.MULTILINE) -re_debian_address = re.compile(r"^.*<(.*)@debian\.org>$", re.MULTILINE) - # From new_security_install.py re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$") # From process_unchecked.py -re_valid_version = re.compile(r"^([0-9]+:)?[0-9A-Za-z\.\-\+:~]+$") -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)') # From dak/rm.py re_strip_source_version = re.compile (r'\s+.*$') @@ -122,9 +101,66 @@ re_re_mark = re.compile(r'^RE:') re_parse_lintian = re.compile(r"^(?PW|E|O): (?P.*?): (?P[^ ]*) ?(?P.*)$") -# in process-upload -re_match_expired = re.compile(r"^The key used to sign .+ has expired on .+$") - # in generate-releases re_gensubrelease = re.compile (r".*/(binary-[0-9a-z-]+|source)$") -re_includeinrelease = re.compile (r"(Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2)?|Sources(.gz|.bz2)?|MD5SUMS|Release)$") +re_includeinrelease = re.compile (r"(Translation-[a-zA-Z_]+\.(?:bz2|xz)|Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2|.xz)?|Sources(.gz|.bz2|.xz)?|Components-[0-9a-z-]+.yml(.gz|.xz)|icons-[0-9x-]+.tar(.gz|.xz)|.*_sigs\.tar\.xz|MD5SUMS|SHA256SUMS|Release)$") + +# in generate_index_diffs +re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))") + + +###################################################################### +# Patterns matching filenames # +###################################################################### + +# Match safe filenames +re_file_safe = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_.~+-]*$') + +# Match safe filenames, including slashes +re_file_safe_slash = re.compile(r'^[a-zA-Z0-9][/a-zA-Z0-9_.~+-]*$') + +# Prefix of binary and source filenames +_re_file_prefix = r'^(?P[a-z0-9][a-z0-9.+-]+)_(?P[A-Za-z0-9.~+-]+?)' + +# Match binary packages +# Groups: package, version, architecture, type +re_file_binary = re.compile(_re_file_prefix + r'_(?P[a-z0-9-]+)\.(?Pu?deb)$') + +# Match changes files +# Groups: package, version, suffix +re_file_changes = re.compile(_re_file_prefix + r'_(?P[a-zA-Z0-9+-]+)\.changes$') + +# Match dsc files +# Groups: package, version +re_file_dsc = re.compile(_re_file_prefix + r'\.dsc$') + +# Match other source files +# Groups: package, version +re_file_source = re.compile(_re_file_prefix + r'\.' + file_source_ext_re) + +# Match upstream tarball +# Groups: package, version +re_file_orig = re.compile(_re_file_prefix + r'\.' + orig_source_ext_re) + +# Match buildinfo file +# Groups: package, version, suffix +re_file_buildinfo = re.compile(_re_file_prefix + r'_(?P[a-zA-Z0-9+-]+)\.buildinfo$') + +###################################################################### +# Patterns matching fields # +###################################################################### + +# Match package name +re_field_package = re.compile(r'^[a-z0-9][a-z0-9.+-]+$') + +# Match version +# Groups: without-epoch +re_field_version = re.compile(r'^(?:[0-9]+:)?(?P[A-Za-z0-9.:~+-]+)$') + +# Extract upstream version +# Groups: upstream +re_field_version_upstream = re.compile(r'^(?:[0-9]+:)?(?P.*)-[^-]*$') + +# Match source field +# Groups: package, version +re_field_source = re.compile(r'^(?P[a-z0-9][a-z0-9.+-]+)(?:\s*\((?P[A-Za-z0-9.:~+-]+)\))?$')