diff options
| author | Joey Hess <joey@kitenet.net> | 2012-08-03 21:17:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-03 21:17:03 -0400 |
| commit | 312bc55934e49a9e91b142661f707aee1933ab87 (patch) | |
| tree | a44fab1b68ab279a7702940e20b10eb3084adf09 | |
| parent | ee919b6c8ce8ba1c85c96fb5cf7c707ae8f21529 (diff) | |
Revert "Avoid hardcoded path in apt.conf. Closes: #683778"
This reverts commit ee919b6c8ce8ba1c85c96fb5cf7c707ae8f21529.
Actually, apt doesn't let me do this.
| -rw-r--r-- | apt.conf | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 4 insertions, 10 deletions
@@ -1,5 +1,5 @@ -DPkg::Pre-Invoke { "if [ -x "`which etckeeper 2>/dev/null`" ]; then etckeeper pre-install; fi"; }; -DPkg::Post-Invoke { "if [ -x "`which etckeeper 2>/dev/null`" ]; then etckeeper post-install; fi"; }; +DPkg::Pre-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install; fi"; }; +DPkg::Post-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper post-install; fi"; }; -RPM::Pre-Invoke { "if [ -x "`which etckeeper 2>/dev/null`" ]; then etckeeper pre-install; fi"; }; -RPM::Post-Invoke { "if [ -x "`which etckeeper 2>/dev/null`" ]; then etckeeper post-install; fi"; }; +RPM::Pre-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper pre-install; fi"; }; +RPM::Post-Invoke { "if [ -x /usr/bin/etckeeper ]; then etckeeper post-install; fi"; }; diff --git a/debian/changelog b/debian/changelog index 405e121..bebe4d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -etckeeper (0.64) UNRELEASED; urgency=low - - * Avoid hardcoded path in apt.conf. Closes: #683778 - - -- Joey Hess <joeyh@debian.org> Fri, 03 Aug 2012 20:52:19 -0400 - etckeeper (0.63) unstable; urgency=low * bzr: Improve detection of unclean repos, to work when there are shelved |