diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
| commit | 03754659d6381ac95d4d5e8dc612d3ad6865b581 (patch) | |
| tree | 0e7339c5937c5d6e3ce44538ddeb83d1e9cfdcfb /pre-install.d/50uncommitted-changes | |
| parent | 3482cc3995b86f0f053a7e010f82451de292a266 (diff) | |
| parent | a3f643fc9d8fc4b45c1bed3cfa8415afb9eb3873 (diff) | |
Merge branch 'master' of git://git.kitenet.net/etckeeper into bzrplugin
Conflicts:
debian/changelog
Diffstat (limited to 'pre-install.d/50uncommitted-changes')
| -rwxr-xr-x | pre-install.d/50uncommitted-changes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index d06883d..465b06c 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -10,6 +10,10 @@ if [ "$1" = "fail-debconf" ]; then fi if etckeeper unclean; then + if [ ! "$AVOID_COMMIT_BEFORE_INSTALL" ]; then + echo "error: etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 + exit 1 + fi if ! etckeeper commit "saving uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run"; then if [ -e /usr/share/debconf/confmodule ]; then $0 fail-debconf |