Merge branch '2.5.x' into saas

2014-10-20 15:25:05 +00:00 · 2014-10-20 15:25:05 +00:00 · 6857d6269f
commit 6857d6269f
parent 9fb35c448e 05096dc808
1 changed files with 2 additions and 0 deletions
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@ -29,8 +29,10 @@ echo "----------------------------------------------------"

 dist=`lsb_release -is`
 code=`lsb_release -cs`
+set +e
 apache2 -v | grep "2\.4" > /dev/null
 apacheversion=$?
+set -e

 #enable squeeze backports to get lame packages
 if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then