archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bamignore now prints the exact error

Browse Source
This commit is contained in:
Campbell Barton
2014-11-28 13:09:50 +01:00
parent 301582e4b7
commit 366204b50c
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/cli/bam.py
View File

@@ -161,14 +161,21 @@ class bam_config:
import os import os
bamignore = os.path.join(path, id_) bamignore = os.path.join(path, id_)
if os.path.isfile(bamignore): if os.path.isfile(bamignore):
with open(bamignore, 'r') as f: with open(bamignore, 'r', encoding='utf-8') as f:
patterns = f.read().split("\n") compiled_patterns = []
import re
try:
compiled_patterns = [re.compile(p) for p in patterns]
except re.error:
fatal("Your .bamignore file contains invalid regular expressions")
import re
for i, l in enumerate(f):
l = l.rstrip()
if l:
try:
p = re.compile(l)
except re.error as e:
fatal("%s:%d file contains an invalid regular expression, %s" %
(bamignore, i + 1, str(e)))
compiled_patterns.append(p)
if compiled_patterns:
def filter_ignore(f): def filter_ignore(f):
for pattern in filter_ignore.compiled_patterns: for pattern in filter_ignore.compiled_patterns:
if re.match(pattern, f): if re.match(pattern, f):
@@ -177,7 +184,7 @@ class bam_config:
filter_ignore.compiled_patterns = compiled_patterns filter_ignore.compiled_patterns = compiled_patterns
return filter_ignore return filter_ignore
else:
return None return None