diff options
| -rwxr-xr-x | commit.d/50vcs-commit | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 |
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 |