diff --git a/CHANGELOG.md b/CHANGELOG.md index 9320ee0..6807520 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ * Introduce `enroll explain` - a tool to analyze and explain what's in (or not in) a harvest and why. * Centralise the cron and logrotate stuff into their respective roles, we had a bit of duplication between roles based on harvest discovery. * Capture other files in the user's home directory such as `.bashrc`, `.bash_aliases`, `.profile`, if these files differ from the `/etc/skel` defaults - * Ignore files that end with a tilde (probably backup files generated by editors) + * Ignore files that end with a tilde or - (probably backup files generated by editors or shadow file changes) # 0.2.3 diff --git a/enroll/ignore.py b/enroll/ignore.py index a079346..92c67f6 100644 --- a/enroll/ignore.py +++ b/enroll/ignore.py @@ -102,7 +102,10 @@ class IgnorePolicy: return "log_file" # Ignore editor/backup files that end with a trailing tilde. if path.endswith("~"): - return "tilde_backup" + return "backup_file" + # Ignore backup shadow files + if path.startswith("/etc/") and path.endswith("-"): + return "backup_file" if not self.dangerous: for g in self.deny_globs or []: