From 7624527d7709d8cceb6e2507903e413ffb7dabc0 Mon Sep 17 00:00:00 2001 From: jnqnfe Date: Wed, 7 Jan 2015 21:42:39 +0000 Subject: defaults: ensure global caching param overrides specific caching params if disabled Closes: #952923 --- functions/defaults.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'functions') diff --git a/functions/defaults.sh b/functions/defaults.sh index fe35ce879..d254b079a 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -217,9 +217,16 @@ Set_defaults () # Setting cache option LB_CACHE="${LB_CACHE:-true}" - LB_CACHE_INDICES="${LB_CACHE_INDICES:-false}" - LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES:-true}" - LB_CACHE_STAGES="${LB_CACHE_STAGES:-bootstrap}" + if [ "${LB_CACHE}" = "false" ] + then + LB_CACHE_INDICES="false" + LB_CACHE_PACKAGES="false" + LB_CACHE_STAGES="bootstrap" #bootstrap caching currently required for process to work + else + LB_CACHE_INDICES="${LB_CACHE_INDICES:-false}" + LB_CACHE_PACKAGES="${LB_CACHE_PACKAGES:-true}" + LB_CACHE_STAGES="${LB_CACHE_STAGES:-bootstrap}" + fi # Setting debconf frontend LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND:-noninteractive}" -- cgit v1.2.3