diff options
| author | Joey Hess <joey@kitenet.net> | 2014-09-04 15:32:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-09-04 15:32:35 -0400 |
| commit | 81d3328154d544d4e857810a81e6080105065e5f (patch) | |
| tree | 1cab49be7096ac9fed5894e6457f9c3ce243adf6 | |
| parent | 7916f15be8169689a3b6c9d0efa6762f204109d1 (diff) | |
Revert "Avoid propigating nonzero exit status of any command called by etckeeper out to the caller. This is to avoid making apt give up because git is misconfigured and cannot commit, or similar. Closes: #760011"
This reverts commit 1b70e83dddcafbcbea84fc55a6396e4876a9a0c4.
This approach breaks the AVOID_COMMIT_BEFORE_INSTALL feature.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | etckeeper | 7 | ||||
| -rw-r--r-- | etckeeper.8 | 4 | ||||
| -rw-r--r-- | etckeeper.spec | 2 |
4 files changed, 1 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index 2970f70..1575d89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -etckeeper (1.14) unstable; urgency=medium - - * Avoid propigating nonzero exit status of any command called by etckeeper - out to the caller. This is to avoid making apt give up because git is - misconfigured and cannot commit, or similar. Closes: #760011 - - -- Joey Hess <joeyh@debian.org> Thu, 04 Sep 2014 14:04:58 -0400 - etckeeper (1.13) unstable; urgency=medium * Ignore check-mk-agent-logwatch's FHS violating @@ -126,12 +126,5 @@ lsscripts() { } for script in $(lsscripts "$ETCKEEPER_CONF_DIR/$command.d"); do - set +e "$script" "$@" - status=$? - set -e - if [ "$status" != 0 ]; then - echo "etckeeper script $script exited $status" >&1 - exit 0 - fi done diff --git a/etckeeper.8 b/etckeeper.8 index 7ac077f..62ae976 100644 --- a/etckeeper.8 +++ b/etckeeper.8 @@ -64,10 +64,6 @@ prompting.) /etc/etckeeper also contains directories containing the programs that are run for each of the above commands. -.SH EXIT STATUS -If the etckeeper command fails to run for some reason, etckeeper will show -what failed, but still exit 0. This is to avoid breaking things like apt -that call etckeeper. .SH ENVIRONMENT VARIABLES ETCKEEPER_CONF_DIR path to configuration directory instead of default /etc/etckeeper. .SH SEE ALSO diff --git a/etckeeper.spec b/etckeeper.spec index e51d643..3478998 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,5 +1,5 @@ Name: etckeeper -Version: 1.14 +Version: 1.13 Release: 4%{?dist} Summary: store /etc in git, mercurial, bzr or darcs |