summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt.conf8
-rw-r--r--debian/changelog6
2 files changed, 10 insertions, 4 deletions
diff --git a/apt.conf b/apt.conf
index 5e690a2..db84f78 100644
--- a/apt.conf
+++ b/apt.conf
@@ -1,5 +1,5 @@
-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"; };
+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"; };
-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"; };
+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"; };
diff --git a/debian/changelog b/debian/changelog
index bebe4d4..405e121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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