diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-06-29 12:56:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-06-29 12:56:25 -0400 |
| commit | fd82d038ded28ec59fdb69bbd959b4031915273c (patch) | |
| tree | 1cb44c0a5c04ab635d5cac95c10253088123fd3a | |
| parent | 3262d47732044603b7b2e391a56c0874768c0fa0 (diff) | |
Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable.
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | pre-install.d/50uncommitted-changes | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 207f6bc..638926f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (0.18) UNRELEASED; urgency=low + + * Allow AVOID_COMMIT_BEFORE_INSTALL to be set to zero to disable. + + -- Joey Hess <joeyh@debian.org> Sun, 29 Jun 2008 12:56:10 -0400 + etckeeper (0.17) unstable; urgency=low * Fix backwards test for AVOID_COMMIT_BEFORE_INSTALL. Closes: #486922 diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes index a5e69d4..47750ac 100755 --- a/pre-install.d/50uncommitted-changes +++ b/pre-install.d/50uncommitted-changes @@ -10,7 +10,7 @@ if [ "$1" = "fail-debconf" ]; then fi if etckeeper unclean; then - if [ "$AVOID_COMMIT_BEFORE_INSTALL" ]; then + if [ "$AVOID_COMMIT_BEFORE_INSTALL" = 1 ]; then echo "" >&2 echo "** etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 echo "** Aborting $HIGHLEVEL_PACKAGE_MANAGER run. Manually commit and restart." >&2 |