summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-01-31 14:37:07 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-01-31 14:37:07 -0500
commit3371831548da8bacd2a7245252a6a151b30060bb (patch)
tree3d88fac152863002ad7551538b8f9efaf2ed0606
parent2d236ffff81e47bb29866fbfa8d87775ab510a68 (diff)
Fix cleanup of /var/cache/etckeeper/packagelist.pre-install after an upgrade where no conffiles are changed.
-rw-r--r--debian/changelog7
-rwxr-xr-xpost-install.d/50vcs-commit5
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index febd590..e77c675 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+etckeeper (0.43) UNRELEASED; urgency=low
+
+ * Fix cleanup of /var/cache/etckeeper/packagelist.pre-install after
+ an upgrade where no conffiles are changed.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 31 Jan 2010 14:36:44 -0500
+
etckeeper (0.42) unstable; urgency=low
* Deal with removal of the cache directory. Closes: #559418
diff --git a/post-install.d/50vcs-commit b/post-install.d/50vcs-commit
index 12fd187..6cb6bd1 100755
--- a/post-install.d/50vcs-commit
+++ b/post-install.d/50vcs-commit
@@ -13,8 +13,11 @@ if etckeeper unclean; then
if [ -n "$diff" ]; then
message="$message$NL${NL}Package changes:$NL$diff"
fi
- rm -f $pl.pre-install
fi
etckeeper commit "$(printf "$message")"
fi
+
+if [ -e $pl.pre-install ]; then
+ rm -f $pl.pre-install
+fi