Commit b33a5d95 authored by Éric Araujo's avatar Éric Araujo

Merge fixes for #13193 and FAQ from 3.2

parents a49a3ee5 994f4c48
......@@ -313,10 +313,8 @@ def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
# ditch end of pattern character
empty_pattern = glob_to_re('')
prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
# match both path separators, as in Postel's principle
sep_pat = "[" + re.escape(os.path.sep + os.path.altsep
if os.path.altsep else os.path.sep) + "]"
pattern_re = "^" + sep_pat.join([prefix_re, ".*" + pattern_re])
# paths should always use / in manifest templates
pattern_re = "^%s/.*%s" % (prefix_re, pattern_re)
else: # no prefix -- respect anchor flag
if anchor:
pattern_re = "^" + pattern_re
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment