Skip to content

Commit d614972

Browse files
author
gau1991
committed
Fixed login to check PHP5.6 repo file
1 parent 1ed5fff commit d614972

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

ee/cli/plugins/stack_upgrade.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class Meta:
4949
@expose(hide=True)
5050
def upgrade_php56(self):
5151
if EEVariables.ee_platform_distro == "Ubuntu":
52-
if not os.path.isfile("/etc/apt/sources.list.d/"
53-
"ondrej-php5-trusty.list"):
52+
if os.path.isfile("/etc/apt/sources.list.d/ondrej-php5-5_6-{0}."
53+
"list".format(EEVariables.ee_platform_codename)):
5454
Log.error(self, "Unable to find PHP 5.5")
5555
else:
5656
if not(os.path.isfile(EEVariables.ee_repo_file_path) and
@@ -69,9 +69,6 @@ def upgrade_php56(self):
6969

7070
if EEVariables.ee_platform_distro == "Ubuntu":
7171
EERepo.remove(self, ppa="ppa:ondrej/php5")
72-
EEFileUtils.remove(self, ['{0}/ondrej-php5-trusty.list'
73-
.format(EEVariables.ee_repo_file_path)])
74-
EERepo.add(self, ppa=EEVariables.ee_php_repo)
7572
else:
7673
EEAptGet.remove(self, ["php5-xdebug"])
7774
EEFileUtils.searchreplace(self, EEVariables.ee_repo_file_path,

0 commit comments

Comments
 (0)