From a4a202459d3370f4053fc460b16181fb4ca0789b Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Mon, 11 May 2015 15:58:09 +0530 Subject: [PATCH 1/2] bypass php repo add for jessie --- ee/cli/plugins/stack.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 272385c3..7e9d652e 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -160,11 +160,13 @@ class EEStackController(CementBaseController): if set(EEVariables.ee_php).issubset(set(apt_packages)): Log.info(self, "Adding repository for PHP, please wait...") + # Add repository for php if EEVariables.ee_platform_distro == 'debian': - Log.debug(self, 'Adding repo_url of php for debian') - EERepo.add(self, repo_url=EEVariables.ee_php_repo) - Log.debug(self, 'Adding Dotdeb/php GPG key') - EERepo.add_key(self, '89DF5277') + if EEVariables.ee_platform_codename is not 'jessie': + Log.debug(self, 'Adding repo_url of php for debian') + EERepo.add(self, repo_url=EEVariables.ee_php_repo) + Log.debug(self, 'Adding Dotdeb/php GPG key') + EERepo.add_key(self, '89DF5277') else: Log.debug(self, 'Adding ppa for PHP') EERepo.add(self, ppa=EEVariables.ee_php_repo) From 6c70b0784dea171386f5697fe0da0918914c41e4 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Mon, 11 May 2015 16:02:04 +0530 Subject: [PATCH 2/2] added jessie support in install script --- ee/cli/plugins/stack.py | 2 +- install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 7e9d652e..5d242489 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -162,7 +162,7 @@ class EEStackController(CementBaseController): Log.info(self, "Adding repository for PHP, please wait...") # Add repository for php if EEVariables.ee_platform_distro == 'debian': - if EEVariables.ee_platform_codename is not 'jessie': + if EEVariables.ee_platform_codename != 'jessie': Log.debug(self, 'Adding repo_url of php for debian') EERepo.add(self, repo_url=EEVariables.ee_php_repo) Log.debug(self, 'Adding Dotdeb/php GPG key') diff --git a/install b/install index 2ca76cf7..c7a1648e 100644 --- a/install +++ b/install @@ -63,7 +63,7 @@ if [ "$ee_linux_distro" != "Ubuntu" ] && [ "$ee_linux_distro" != "Debian" ]; the fi # EasyEngine (ee) only support all Ubuntu/Debian distro except the distro reached EOL -lsb_release -d | egrep -e "12.04|14.04|wheezy" &>> /dev/null +lsb_release -d | egrep -e "12.04|14.04|wheezy|jessie" &>> /dev/null if [ "$?" -ne "0" ]; then ee_lib_echo_fail "EasyEngine (ee) only support Ubuntu 12.04/14.04 and Debian 7.x" exit 100