Code Review
/
releng-anteater.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Implements master ignore list
[releng-anteater.git]
/
anteater
/
src
/
get_lists.py
diff --git
a/anteater/src/get_lists.py
b/anteater/src/get_lists.py
index
17de7cb
..
ff63442
100644
(file)
--- a/
anteater/src/get_lists.py
+++ b/
anteater/src/get_lists.py
@@
-27,9
+27,13
@@
config = six.moves.configparser.RawConfigParser()
config.read('anteater.conf')
logger = logging.getLogger(__name__)
master_list = config.get('config', 'master_list')
config.read('anteater.conf')
logger = logging.getLogger(__name__)
master_list = config.get('config', 'master_list')
+ignore_list = config.get('config', 'ignore_list')
with open(master_list, 'r') as f:
with open(master_list, 'r') as f:
- yl = yaml.safe_load(f)
+ ml = yaml.safe_load(f)
+
+with open(ignore_list, 'r') as f:
+ il = yaml.safe_load(f)
def _remove_nullvalue(contents):
def _remove_nullvalue(contents):
@@
-65,14
+69,14
@@
class GetLists(object):
with open(exception_file, 'r') as f:
ex = yaml.safe_load(f)
for key in ex:
with open(exception_file, 'r') as f:
ex = yaml.safe_load(f)
for key in ex:
- if key in
y
l:
-
yl[key][project] = _merge(y
l[key][project], ex.get(key, None)) \
- if project in
y
l[key] else ex.get(key, None)
+ if key in
m
l:
+
ml[key][project] = _merge(m
l[key][project], ex.get(key, None)) \
+ if project in
m
l[key] else ex.get(key, None)
self.loaded = True
def binary_list(self, project):
try:
self.loaded = True
def binary_list(self, project):
try:
- default_list = (
y
l['binaries']['binary_ignore'])
+ default_list = (
m
l['binaries']['binary_ignore'])
except KeyError:
logger.error('Key Error processing binary list values')
except KeyError:
logger.error('Key Error processing binary list values')
@@
-81,10
+85,10
@@
class GetLists(object):
return binary_re
def binary_hash(self, project, patch_file):
return binary_re
def binary_hash(self, project, patch_file):
- self.load_project_exception_file(
y
l.get('project_exceptions'), project)
+ self.load_project_exception_file(
m
l.get('project_exceptions'), project)
file_name = os.path.basename(patch_file)
try:
file_name = os.path.basename(patch_file)
try:
- binary_hash = (
y
l['binaries'][project][file_name])
+ binary_hash = (
m
l['binaries'][project][file_name])
return binary_hash
except KeyError:
binary_hash = 'null'
return binary_hash
except KeyError:
binary_hash = 'null'
@@
-93,13
+97,13
@@
class GetLists(object):
def file_audit_list(self, project):
project_list = False
def file_audit_list(self, project):
project_list = False
- self.load_project_exception_file(
y
l.get('project_exceptions'), project)
+ self.load_project_exception_file(
m
l.get('project_exceptions'), project)
try:
try:
- default_list = set((
y
l['file_audits']['file_names']))
+ default_list = set((
m
l['file_audits']['file_names']))
except KeyError:
logger.error('Key Error processing file_names list values')
try:
except KeyError:
logger.error('Key Error processing file_names list values')
try:
- project_list = set((
y
l['file_audits'][project]['file_names']))
+ project_list = set((
m
l['file_audits'][project]['file_names']))
logger.info('file_names waivers found for %s', project)
except KeyError:
logger.info('No file_names waivers found for %s', project)
logger.info('file_names waivers found for %s', project)
except KeyError:
logger.info('No file_names waivers found for %s', project)
@@
-117,39
+121,48
@@
class GetLists(object):
def file_content_list(self, project):
project_list = False
def file_content_list(self, project):
project_list = False
- self.load_project_exception_file(
y
l.get('project_exceptions'), project)
+ self.load_project_exception_file(
m
l.get('project_exceptions'), project)
try:
try:
- master_list = (
y
l['file_audits']['file_contents'])
+ master_list = (
m
l['file_audits']['file_contents'])
except KeyError:
logger.error('Key Error processing file_contents list values')
try:
except KeyError:
logger.error('Key Error processing file_contents list values')
try:
- project_list = set((yl['file_audits'][project]['file_contents']))
- project_list_re = re.compile("|".join(project_list),
- flags=re.IGNORECASE)
+ ignore_list = il['file_audits']['file_contents']
+
+ except KeyError:
+ logger.error('Key Error processing file_contents list values')
+
+ try:
+ project_list = ml['file_audits'][project]['file_contents']
+
except KeyError:
logger.info('No file_contents waivers found for %s', project)
except KeyError:
logger.info('No file_contents waivers found for %s', project)
- return master_list, project_list_re
+ ignore_list_merge = project_list + ignore_list
+
+ ignore_list_re = re.compile("|".join(ignore_list_merge), flags=re.IGNORECASE)
+
+ return master_list, ignore_list_re
def file_ignore(self):
try:
def file_ignore(self):
try:
- file_ignore = (
y
l['file_ignore'])
+ file_ignore = (
m
l['file_ignore'])
except KeyError:
logger.error('Key Error processing file_ignore list values')
return file_ignore
def licence_extensions(self):
try:
except KeyError:
logger.error('Key Error processing file_ignore list values')
return file_ignore
def licence_extensions(self):
try:
- licence_extensions = (
y
l['licence']['licence_ext'])
+ licence_extensions = (
m
l['licence']['licence_ext'])
except KeyError:
logger.error('Key Error processing licence_extensions list values')
return licence_extensions
def licence_ignore(self):
try:
except KeyError:
logger.error('Key Error processing licence_extensions list values')
return licence_extensions
def licence_ignore(self):
try:
- licence_ignore = (
y
l['licence']['licence_ignore'])
+ licence_ignore = (
m
l['licence']['licence_ignore'])
except KeyError:
logger.error('Key Error processing licence_ignore list values')
return licence_ignore
except KeyError:
logger.error('Key Error processing licence_ignore list values')
return licence_ignore