summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarracuda Team2013-08-31 14:55:15 (GMT)
committer Barracuda Team2013-08-31 14:55:15 (GMT)
commit45f0aaf577dee822a4a85468ed4d0e0371ccb704 (patch)
tree60a23ce02fe30492056ef255e333a046b0a90a77
parent2e644f36b51b6761efe1a01cef4e9b830d620466 (diff)
Contrib: Enable views_cache_bully and views_content_cache only when views module is already enabled.
-rwxr-xr-xaegir/tools/system/daily.sh14
-rw-r--r--docs/MODULES.txt3
2 files changed, 12 insertions, 5 deletions
diff --git a/aegir/tools/system/daily.sh b/aegir/tools/system/daily.sh
index 8fcbf92..7bb387c 100755
--- a/aegir/tools/system/daily.sh
+++ b/aegir/tools/system/daily.sh
@@ -116,9 +116,17 @@ fix_modules () {
fi
su -s /bin/bash $_THIS_HM_USER -c "drush en $_MODULES_ON_SEVEN -y &> /dev/null"
fi
- if [ ! -e "$Plr/sites/all/modules/views_cache_bully_dont_enable.info" ] ; then
- if [ -e "$Plr/modules/o_contrib_seven/views_cache_bully" ] || [ -e "$Plr/modules/o_contrib/views_cache_bully" ] ; then
- su -s /bin/bash $_THIS_HM_USER -c "drush en views_cache_bully -y &> /dev/null"
+ _VIEWS_TEST=$(drush pml --status=enabled --no-core --type=module | grep Views)
+ if [[ "$_VIEWS_TEST" =~ "Views" ]] && [ ! -e "$Plr/profiles/hostmaster" ] ; then
+ if [ ! -e "$Plr/sites/all/modules/views_cache_bully_dont_enable.info" ] ; then
+ if [ -e "$Plr/modules/o_contrib_seven/views_cache_bully" ] || [ -e "$Plr/modules/o_contrib/views_cache_bully" ] ; then
+ su -s /bin/bash $_THIS_HM_USER -c "drush en views_cache_bully -y &> /dev/null"
+ fi
+ fi
+ if [ ! -e "$Plr/sites/all/modules/views_content_cache_dont_enable.info" ] ; then
+ if [ -e "$Plr/modules/o_contrib_seven/views_content_cache" ] || [ -e "$Plr/modules/o_contrib/views_content_cache" ] ; then
+ su -s /bin/bash $_THIS_HM_USER -c "drush en views_content_cache -y &> /dev/null"
+ fi
fi
fi
fi
diff --git a/docs/MODULES.txt b/docs/MODULES.txt
index b5810d9..d35b08b 100644
--- a/docs/MODULES.txt
+++ b/docs/MODULES.txt
@@ -78,8 +78,6 @@ Contrib [S]upported and [B]undled:
textile -------------------- [D6,D7] --- [S] [B]
variable_clean ------------- [D6,D7] --- [S] [B]
vars ----------------------- [D7] ------ [S] [B]
-
- views_content_cache -------- [D6,D7] --- [S] [B]
views404 ------------------- [D6,D7] --- [S] [B]
Contrib [NA], [S]oft[E]nabled and [F]orce[E]nabled:
@@ -91,6 +89,7 @@ Contrib [NA], [S]oft[E]nabled and [F]orce[E]nabled:
robotstxt ------------------ [D6,D7] --- [S] [B] [FE]
rubik ---------------------- [D6,D7] --- [S] [B] [SE]
views_cache_bully ---------- [D6,D7] --- [S] [B] [FE] unless sites/all/modules/views_cache_bully_dont_enable.info exists
+ views_content_cache -------- [D6,D7] --- [S] [B] [FE] unless sites/all/modules/views_content_cache_dont_enable.info exists
Contrib [F]orce[D]isabled: