[debian-edu-commits] debian-edu/ 01/01: Adjust edu-eatmydata-install to not report an error when eatmydata already is activated, but instead log that it is already in place. This avoid a bogus error being reported to those testing Debian Edu Jessie (Closes: #770110).

[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-install.

commit d8ac75b22be8f8172dfa6df2ae2890cfb08efd83
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Nov 18 23:11:16 2014 +0100

    Adjust edu-eatmydata-install to not report an error when eatmydata already is activated, but instead log that it is already in place. This avoid a bogus error being reported to those testing Debian Edu Jessie (Closes: #770110).
---
 debian/changelog            | 4 ++++
 tools/edu-eatmydata-install | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f78db6..bc47f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ debian-edu-install (1.818) UNRELEASED; urgency=low
 
   * Reenable eatmydata during installation now that bug #765694 is fixed
     in unstable and accepted for testing.
+  * Adjust edu-eatmydata-install to not report an error when eatmydata
+    already is activated, but instead log that it is already in place.
+    This avoid a bogus error being reported to those testing Debian
+    Edu Jessie (Closes: #770110).
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 14 Nov 2014 15:30:12 +0100
 
diff --git a/tools/edu-eatmydata-install b/tools/edu-eatmydata-install
index da82d6d..9ab19c2 100755
--- a/tools/edu-eatmydata-install
+++ b/tools/edu-eatmydata-install
@@ -19,8 +19,8 @@ trap at_exit INT TERM EXIT
 
 enable_override() {
     apt-install eatmydata || true
-    if [ -x /target/usr/bin/eatmydata ] && \
-	[ ! -f /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata ]; then
+    if [ -x /target/usr/bin/eatmydata ] ; then
+      if [ ! -f /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata ]; then
         info "Adding apt config to call dpkg via eatmydata"
         printf "#!/bin/sh\nexec eatmydata dpkg \"\$@\"\n" \
             > /target/var/tmp/dpkg-eatmydata
@@ -28,6 +28,9 @@ enable_override() {
         cat > /target/etc/apt/apt.conf.d/95debian-edu-install-dpkg-eatmydata <<EOF
 Dir::Bin::dpkg "/var/tmp/dpkg-eatmydata";
 EOF
+      else
+	    info "apt redirect for eatmydata already in place"
+      fi
     else
         error "unable to find /usr/bin/eatmydata after installing the eatmydata package"
     fi

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