mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cboltz-skip-git-dir' into 'master'

Browse source 
ignore .git in is_skippable_dir()

See merge request apparmor/apparmor!77

Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Christian Boltz 2018-03-16 21:35:52 +00:00
commit 3b5683be29
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/apparmor/aa.py
View file

@ -2038,7 +2038,7 @@ def is_skippable_file(path):
return False
def is_skippable_dir(path):
if re.search('^(.*/)?(disable|cache|force-complain|lxc)/?$', path):
if re.search('^(.*/)?(disable|cache|force-complain|lxc|\.git)/?$', path):
return True
return False

1
utils/test/test-aa.py
View file

@ -479,6 +479,7 @@ class AaTest_is_skippable_dir(AATest):
('force-complain', True),
('/etc/apparmor.d/cache', True),
('/etc/apparmor.d/lxc/', True),
('/etc/apparmor.d/.git/', True),
('dont_disable', False),
('/etc/apparmor.d/cache_foo', False),