Merge branch 'cboltz-utils-exclude-cache-d' into 'master'

is_skippable_dir(): add 'cache.d' to exclude list

See merge request apparmor/apparmor!110

Acked-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2018-04-30 05:07:07 +00:00
commit 67d84c8959
2 changed files with 3 additions and 1 deletions

View file

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

View file

@ -484,6 +484,8 @@ class AaTest_is_skippable_dir(AATest):
('lxc', True),
('force-complain', True),
('/etc/apparmor.d/cache', True),
('/etc/apparmor.d/cache.d', True),
('/etc/apparmor.d/cache.d/', True),
('/etc/apparmor.d/lxc/', True),
('/etc/apparmor.d/.git/', True),