summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-09-28 12:11:06 -0400
committerJoey Hess <joey@kitenet.net>2011-09-28 12:11:06 -0400
commit09e7c045049328cebde375e28ed3ad315c364a90 (patch)
tree945fbbf785d3f88b5ee5b3f92720a9cab0c1e031
parent603dc934a94a5df7d9bd99642df2d88bffea7824 (diff)
Use find -path instead of less portable find -wholename.
-rw-r--r--debian/changelog6
-rwxr-xr-xinit.d/60darcs-deleted-symlinks2
-rwxr-xr-xpre-commit.d/30store-metadata2
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5a02992..99b5ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (0.57) UNRELEASED; urgency=low
+
+ * Use find -path instead of less portable find -wholename.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 28 Sep 2011 12:10:53 -0400
+
etckeeper (0.56) unstable; urgency=low
* Converted to use dh_python2. Closes: #616800
diff --git a/init.d/60darcs-deleted-symlinks b/init.d/60darcs-deleted-symlinks
index 8d10d56..9c34e95 100755
--- a/init.d/60darcs-deleted-symlinks
+++ b/init.d/60darcs-deleted-symlinks
@@ -25,7 +25,7 @@ filter_ignore() {
if [ "$VCS" = darcs ];then
- NOVCS='. -wholename ./.git -prune -o -wholename ./.bzr -prune -o -wholename ./.hg -prune -o -wholename ./_darcs -prune -o'
+ NOVCS='. -path ./.git -prune -o -path ./.bzr -prune -o -path ./.hg -prune -o -path ./_darcs -prune -o'
# We assume that if .etckeeper is empty this is the first run
if [ -s .etckeeper ]; then
diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata
index 76a3d65..d1facd6 100755
--- a/pre-commit.d/30store-metadata
+++ b/pre-commit.d/30store-metadata
@@ -56,7 +56,7 @@ generate_metadata() {
# (Note that when using this, the find expression must end with
# -print or -exec, else the excluded directories will actually be
# printed!)
- NOVCS='. -wholename ./.git -prune -o -wholename ./.bzr -prune -o -wholename ./.hg -prune -o -wholename ./_darcs -prune -o'
+ NOVCS='. -path ./.git -prune -o -path ./.bzr -prune -o -path ./.hg -prune -o -path ./_darcs -prune -o'
# Keep the sort order the same at all times.
LC_COLLATE=C