Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cda227ee authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Accept the "file:(project:)?filePath" directive."

parents a6d9bd53 cc477297
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -52,12 +52,13 @@ def main():
  noparent = 'set +noparent'
  email = '([^@ ]+@[^ @]+|\\*)'
  emails = '(%s( *, *%s)*)' % (email, email)
  directive = '(%s|%s)' % (emails, noparent)
  file_directive = 'file: *([^ :]+ *: *)?[^ ]+'
  directive = '(%s|%s|%s)' % (emails, noparent, file_directive)
  glob = '[a-zA-Z0-9_\\.\\-\\*\\?]+'
  globs = '(%s( *, *%s)*)' % (glob, glob)
  perfile = 'per-file +' + globs + ' *= *' + directive
  include = 'include +([^ :]+ *: *)?[^ ]+'
  pats = '(|%s|%s|%s|%s)$' % (noparent, email, perfile, include)
  pats = '(|%s|%s|%s|%s|%s)$' % (noparent, email, perfile, include, file_directive)
  patterns = re.compile(pats)
  address_pattern = re.compile('([^@ ]+@[^ @]+)')
  perfile_pattern = re.compile('per-file +.*=(.*)')