summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/templates8
2 files changed, 6 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index e11e941..ca4ce2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
etckeeper (1.14) UNRELEASED; urgency=medium
- * Use debconf for prompting when post-install commit fails, as was
- already done for pre-install commit. This avoids propigating
- errors to apt when eg, git is misconfigured and cannot commit.
+ * Handle failure to commit in post-install, pre-install by showing a
+ warning, rather than propigating the error to apt.
+ This avoids breaking the apt run when eg, git is misconfigured and
+ cannot commit.
+ pre-install already did this when it was able to use debconf to display a
+ message, but now debconf is not used, and it always behaves this way.
Closes: #760011
-- Joey Hess <joeyh@debian.org> Thu, 04 Sep 2014 15:41:39 -0400
diff --git a/debian/templates b/debian/templates
index 2cec92c..96f5c44 100644
--- a/debian/templates
+++ b/debian/templates
@@ -7,14 +7,6 @@
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-Template: etckeeper/commit_failed
-Type: error
-_Description: Commit failed
- An attempt to commit /etc changes to ${VCS} failed.
- .
- You may manually resolve the issues with the uncommitted changes
- before continuing.
-
Template: etckeeper/purge
Type: boolean
Default: true