[debian-edu-commits] debian-edu/ 01/01: Log an error if cfengine return failure, to make it easier to discover if it ever happen.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit c9f6dec4abce6ddec0bd42151954213125444622
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Oct 7 09:26:44 2014 +0200

    Log an error if cfengine return failure, to make it easier to discover if it ever happen.
---
 debian/changelog                           | 2 ++
 share/debian-edu-config/d-i/finish-install | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9e07c77..fbc9557 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu-config (1.809) UNRELEASED; urgency=low
 
   * Make sure to install our default squid3 configuration for cfengine
     to find it.
+  * Log an error if cfengine return failure, to make it easier to
+    discover if it ever happen.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 Oct 2014 08:07:03 +0200
 
diff --git a/share/debian-edu-config/d-i/finish-install b/share/debian-edu-config/d-i/finish-install
index 25d4c8b..ea8d945 100644
--- a/share/debian-edu-config/d-i/finish-install
+++ b/share/debian-edu-config/d-i/finish-install
@@ -67,7 +67,11 @@ epid=$!
 . /usr/lib/finish-install.d/94save-logs
 
 # Update configuration for everything that could not be preseeded
-in-target cfengine-debian-edu -D installation || true
+if in-target cfengine-debian-edu -D installation ; then
+    :
+else
+    log "error: Running 'cfengine-debian-edu -D installation' returned an error"
+fi
 
 edu-etcvcs commit
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git