[pbuilder] 05/08: modules: don't remove eatmydata from inside the chroot if it's not available outside

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository pbuilder.

commit 2d0c5b60917ef1c8709c4d5d6a0c44b6b50c1c99
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu Jun 16 12:50:35 2016 +0000

    modules: don't remove eatmydata from inside the chroot if it's not available outside
---
 pbuilder-checkparams | 4 ++--
 pbuilder-modules     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index adc07ec..db0eb22 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -349,11 +349,11 @@ if [ -z "${CHROOTEXEC}" ]; then
         if /sbin/ldconfig -p | grep libeatmydata >/dev/null 2>&1 ; then
             if ! which eatmydata > /dev/null 2>&1 ; then
                 log.w "the eatmydata binary is not installed on the host, not using it."
-                EATMYDATA=no
+                EATMYDATA=not-available
             fi
         else
             log.w "libeatmydata is not installed on the host, not using it."
-            EATMYDATA=no
+            EATMYDATA=not-available
         fi
     fi
 fi
diff --git a/pbuilder-modules b/pbuilder-modules
index dec2ef3..c2ecef3 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -777,7 +777,7 @@ function install_packages_for_optional_features() {
         # binary is shaped like a shared library, so the name might change, etc.
         # Install this package instead, it's cheap enough.
         EXTRAPACKAGES="$EXTRAPACKAGES eatmydata"
-    else
+    elif [ "$EATMYDATA" != "not-available" ]; then
         REMOVEPACKAGES="$REMOVEPACKAGES eatmydata"
     fi
 

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