summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-04-17 13:42:25 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-04-17 13:42:25 -0400
commit3738e331666e572c677e258f080382651e7cab59 (patch)
tree518283a44770f6925291a6332212de3c948ae43e
parentcb01f4f89df7384d1b5593e3461786ab931aa52f (diff)
Handle nonzero exit status when building package list diff.
-rw-r--r--debian/changelog6
-rwxr-xr-xpost-install.d/50vcs-commit2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7e4e387..cce5561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,12 @@ etckeeper (0.15) UNRELEASED; urgency=low
-- Jelmer Vernooij <jelmer@samba.org> Sat, 05 Apr 2008 23:39:11 +0200
+etckeeper (0.14.2) unstable; urgency=low
+
+ * Handle nonzero exit status when building package list diff.
+
+ -- Joey Hess <joeyh@debian.org> Thu, 17 Apr 2008 13:00:29 -0400
+
etckeeper (0.14.1) unstable; urgency=low
* Fix typo in bzr-precommit script. Closes: #473069
diff --git a/post-install.d/50vcs-commit b/post-install.d/50vcs-commit
index 1b88da7..12fd187 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
- diff="$(etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]')"
+ diff="$(etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]')" || true
if [ -n "$diff" ]; then
message="$message$NL${NL}Package changes:$NL$diff"
fi