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

This excludes the /etc/apparmor.d/cache.d/ directory from aa-logprof
parsing because parsing the binary cache, well, takes a while :-/

Reported on the opensuse-factory mailinglist by Frank Krüger and
confirmed by others.

(cherry picked from commit 5b9497a8c6)
This commit is contained in:
Christian Boltz 2018-04-30 00:54:58 +02:00
parent 09050a8a8b
commit cdaf5075cb
Failed to generate hash of commit
2 changed files with 3 additions and 1 deletions

View file

@ -2202,7 +2202,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

@ -464,6 +464,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),