X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fregexes.py;h=40b4a74132c284657f330a9ad3b8ce2d7fc0e0e3;hb=c7c3004d7fb00f8d419178ea982d30ab2c61b681;hp=6a1acd828e6a7185ad825bfc092915c5cbec7995;hpb=3cab1066a3d166b418a4c85ade4b41937e3a850c;p=dak.git diff --git a/daklib/regexes.py b/daklib/regexes.py index 6a1acd82..40b4a741 100644 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -102,7 +102,7 @@ re_parse_lintian = re.compile(r"^(?PW|E|O): (?P.*?): (?P[^ # in generate-releases re_gensubrelease = re.compile (r".*/(binary-[0-9a-z-]+|source)$") -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)?|MD5SUMS|SHA256SUMS|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)|MD5SUMS|SHA256SUMS|Release)$") # in generate_index_diffs re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))") @@ -135,11 +135,15 @@ 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'(?:(?:\.orig(?:-[a-zA-Z0-9-]+)?|\.debian)?\.tar\.(?:bz2|gz|xz)|\.diff\.gz)$') +re_file_source = re.compile(_re_file_prefix + r'(?:(?:\.orig(?:-[a-zA-Z0-9-]+)?|\.debian)?\.tar\.(?:bz2|gz|xz)|\.diff\.gz|\.asc)$') # Match upstream tarball # Groups: package, version -re_file_orig = re.compile(_re_file_prefix + r'\.orig(?:-[a-zA-Z0-9-]+)?\.tar\.(?:bz2|gz|xz)') +re_file_orig = re.compile(_re_file_prefix + r'\.orig(?:-[a-zA-Z0-9-]+)?(?:\.tar\.(?:bz2|gz|xz)|\.asc)') + +# 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 #