make clean-conflict automatically delete some files
in the conflicts resolution procedure, we tell our operators to systematically ignore some configuration files provided by the debian package.
that's error prone and annoying. we could do better. a few ideas:
-
possibly rewrite the script in python, possibly as a fabric function so it can be ran remotely too? -
sort the file list so the operator can more easily match with the list -
just have a list of files that can be safely dropped by the script (possibly backed up? maybe in the puppet clientbucket?)
the script is a rather unwieldy shell script right now, it might be worth rewriting in python in any case, and first.