Merge branch '2.5.x' into saas
This commit is contained in:
commit
6857d6269f
1 changed files with 2 additions and 0 deletions
|
@ -29,8 +29,10 @@ echo "----------------------------------------------------"
|
||||||
|
|
||||||
dist=`lsb_release -is`
|
dist=`lsb_release -is`
|
||||||
code=`lsb_release -cs`
|
code=`lsb_release -cs`
|
||||||
|
set +e
|
||||||
apache2 -v | grep "2\.4" > /dev/null
|
apache2 -v | grep "2\.4" > /dev/null
|
||||||
apacheversion=$?
|
apacheversion=$?
|
||||||
|
set -e
|
||||||
|
|
||||||
#enable squeeze backports to get lame packages
|
#enable squeeze backports to get lame packages
|
||||||
if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
|
if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue