summaryrefslogtreecommitdiff
path: root/pre-install.d/50uncommitted-changes
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-14 01:53:33 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-03-14 01:53:33 -0400
commit63dbaa8e2a8bef7413142b108d9bf7a8cd950910 (patch)
tree724186b6761bf7fea138f014c21ed53045d03e25 /pre-install.d/50uncommitted-changes
parent851884c5c24e8314b4e633426dbe88cd9f926096 (diff)
* Drop the debconf prompt before committing in pre-install.
Closes: #470577, #462161
Diffstat (limited to 'pre-install.d/50uncommitted-changes')
-rwxr-xr-xpre-install.d/50uncommitted-changes40
1 files changed, 6 insertions, 34 deletions
diff --git a/pre-install.d/50uncommitted-changes b/pre-install.d/50uncommitted-changes
index 4e573dc..8c0d4d6 100755
--- a/pre-install.d/50uncommitted-changes
+++ b/pre-install.d/50uncommitted-changes
@@ -9,25 +9,7 @@ status() {
fi
}
-if [ "$1" = "ask-debconf" ]; then
- . /usr/share/debconf/confmodule
- db_capb escape
- db_title etckeeper
-
- db_reset etckeeper/unclean || true
- db_subst etckeeper/unclean VCS "$VCS"
- db_subst etckeeper/unclean STATUS $(status | debconf-escape -e) || true
- db_input critical etckeeper/unclean || true
- db_go || true
- db_get etckeeper/unclean
- val="$RET"
- db_reset etckeeper/unclean || true
- if [ "$val" = true ]; then
- exit 0
- else
- exit 1
- fi
-elif [ "$1" = "fail-debconf" ]; then
+if [ "$1" = "fail-debconf" ]; then
. /usr/share/debconf/confmodule
db_subst etckeeper/commit_failed VCS "$VCS"
db_input critical etckeeper/commit_failed || true
@@ -36,22 +18,12 @@ elif [ "$1" = "fail-debconf" ]; then
fi
if etckeeper unclean; then
- docommit="true"
- if [ -e /usr/share/debconf/confmodule ]; then
- if $0 ask-debconf; then
- docommit=true
+ 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
else
- docommit=false
- fi
- fi
- if [ "$docommit" = true ]; then
- 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
- else
- echo "error: etckeeper failed to commit changes in /etc using $VCS"
- exit 1
- fi
+ echo "error: etckeeper failed to commit changes in /etc using $VCS"
+ exit 1
fi
fi
fi