diff options
| author | Joey Hess <joey@kitenet.net> | 2011-11-25 19:10:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-25 19:10:16 -0400 |
| commit | b157bb239385be4ea2883c1419be98af51ff5dfd (patch) | |
| tree | 5caafa347434ee010218d51c63e7374a3aa630bb /debian/preinst | |
| parent | 72fc4fc6977e1642df5246ea80b69dbcdd3206d4 (diff) | |
| parent | f8ccc8f93ecaacb7db2633319d15cc5441fa7bad (diff) | |
Use git add -A, which automatically removes deleted files, and avoids a separate call to git add -u. Thanks to Miklos Vajna, whose patch in 2008 was deferred because -A was then too new, and languished in a branch until found today.
Diffstat (limited to 'debian/preinst')
| -rw-r--r-- | debian/preinst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/preinst b/debian/preinst index d7011d9..a510cef 100644 --- a/debian/preinst +++ b/debian/preinst @@ -74,6 +74,11 @@ install|upgrade) rm_conffile etckeeper "/etc/etckeeper/pre-commit.d/$c" done fi + if dpkg --compare-versions "$2" le "0.58"; then + for c in commit.d/40git-rm; do + rm_conffile etckeeper "/etc/etckeeper/pre-commit.d/$c" + done + fi # delete files the prerm stashes away to handle purging rm -rf /var/cache/etckeeper/stash |