summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-04-15 11:49:04 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-04-15 11:49:04 -0400
commitd168993b0e54f3f98ef804798f6a0d0029ee1175 (patch)
treed1ce27a4cdebfdbc13316ce0b3979f9ab8677b87
parent2a0b0bcab54bffadccbbdee80b4d46fab4609f1b (diff)
Revert darcs to using --logfile again, necessary for multiline commit messages. Closes: #577915
-rwxr-xr-xcommit.d/50vcs-commit4
-rw-r--r--debian/changelog7
2 files changed, 10 insertions, 1 deletions
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index da99d14..a2651bb 100755
--- a/commit.d/50vcs-commit
+++ b/commit.d/50vcs-commit
@@ -49,11 +49,13 @@ elif [ "$VCS" = bzr ] && [ -d .bzr ]; then
bzr commit "$BZR_AUTHOR" $BZR_COMMIT_OPTIONS
fi
elif [ "$VCS" = darcs ] && [ -d _darcs ]; then
+ logfile="$(mktemp -t etckeeper-$VCS.XXXXXXXXXX)"
+ printf "%b" "$message" > "$logfile"
if [ -n "$USER" ]; then
USER=root
fi
if [ -n "$message" ]; then
- darcs record --author="$USER" $DARCS_COMMIT_OPTIONS -m "$message"
+ darcs record --author="$USER" $DARCS_COMMIT_OPTIONS --logfile="$logfile"
else
darcs record --author="$USER" $DARCS_COMMIT_OPTIONS
fi
diff --git a/debian/changelog b/debian/changelog
index 57809bd..46c730f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+etckeeper (0.45) UNRELEASED; urgency=low
+
+ * Revert darcs to using --logfile again, necessary for multiline commit
+ messages. Closes: #577915
+
+ -- Joey Hess <joeyh@debian.org> Thu, 15 Apr 2010 11:48:37 -0400
+
etckeeper (0.44) unstable; urgency=low
* Add example to README of how to automatically push changes to a backup