From a3f643fc9d8fc4b45c1bed3cfa8415afb9eb3873 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 7 Jun 2008 16:11:59 -0400
Subject: Add a AVOID_COMMIT_BEFORE_INSTALL option in the config file to make
 it easy to configure etckeeper to abort an installation if there are
 uncommitted changes in /etc. Closes: #478754

---
 debian/changelog                    | 8 ++++++++
 etckeeper                           | 3 +++
 etckeeper.conf                      | 5 +++++
 pre-install.d/50uncommitted-changes | 4 ++++
 4 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3670a91..661548a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+etckeeper (0.16) UNRELEASED; urgency=low
+
+  * Add a AVOID_COMMIT_BEFORE_INSTALL option in the config file to make it
+    easy to configure etckeeper to abort an installation if there are
+    uncommitted changes in /etc. Closes: #478754
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 07 Jun 2008 16:07:09 -0400
+
 etckeeper (0.15) unstable; urgency=low
 
   [ Daniel Hahler ]
diff --git a/etckeeper b/etckeeper
index 49d1063..01bf326 100755
--- a/etckeeper
+++ b/etckeeper
@@ -33,6 +33,9 @@ fi
 if [ ! -z "$LOWLEVEL_PACKAGE_MANAGER" ]; then
 	export LOWLEVEL_PACKAGE_MANAGER
 fi
+if [ ! -z "$AVOID_COMMIT_BEFORE_INSTALL" ]; then
+	export AVOID_COMMIT_BEFORE_INSTALL
+fi
 
 if [ -z "$1" ]; then
 	usage
diff --git a/etckeeper.conf b/etckeeper.conf
index f7a7ddf..f1438ab 100644
--- a/etckeeper.conf
+++ b/etckeeper.conf
@@ -12,6 +12,11 @@ VCS="git"
 # Options passed to bzr commit when run by etckeeper.
 #BZR_COMMIT_OPTIONS=""
 
+# Uncomment to avoid etckeeper committing existing changes to 
+# /etc before installation. It will cancel the installation,
+# so you can commit the changes by hand.
+#AVOID_COMMIT_BEFORE_INSTALL=1
+
 # The high-level package manager that's being used.
 HIGHLEVEL_PACKAGE_MANAGER=apt
 
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
-- 
cgit v1.2.3