summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-25 21:05:24 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-03-25 21:05:24 -0400
commitc761fd145e5d56507ea8d5546ae004f3836b4b5b (patch)
tree4aff63003027b2ff4a46c29ab0d7a302f7b1b6b2
parentb4b7c0996c73291b34f0566f74ad2513c44a6371 (diff)
filter out @@ in diff
-rw-r--r--debian/changelog4
-rwxr-xr-xpost-install.d/50vcs-commit2
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 28f905e..5af1274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-etckeeper (0.13) UNRELEASED; urgency=low
+etckeeper (0.13) unstable; urgency=low
* Drop the debconf prompt before committing in pre-install.
Closes: #470577, #462161, #471157, #462161
@@ -18,7 +18,7 @@ etckeeper (0.13) UNRELEASED; urgency=low
* Keep track of what packages change state during an installation,
and include that in the commit message at the end. Closes: #459384
- -- Joey Hess <joeyh@debian.org> Fri, 14 Mar 2008 01:51:53 -0400
+ -- Joey Hess <joeyh@debian.org> Tue, 25 Mar 2008 20:53:23 -0400
etckeeper (0.12) unstable; urgency=low
diff --git a/post-install.d/50vcs-commit b/post-install.d/50vcs-commit
index 76fb668..f223029 100755
--- a/post-install.d/50vcs-commit
+++ b/post-install.d/50vcs-commit
@@ -9,7 +9,7 @@ if etckeeper unclean; then
message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run"
if [ -e $pl.pre-install ]; then
- message="$message$NL$(etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4)"
+ message="$message$NL$(etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]')"
rm -f $pl.pre-install
fi