lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

bug fix in site update

bugfixes
harshadyeola 10 years ago
parent
5862a6da49
commit
f1e17cfee6
1 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      ee/cli/plugins/site.py

32
ee/cli/plugins/site.py
View File

@ -578,9 +578,9 @@ class EESiteUpdateController(CementBaseController):
or self.app.pargs.wpfc or self.app.pargs.wpsc)): or self.app.pargs.wpfc or self.app.pargs.wpsc)):
if ((oldsitetype not in ['html', 'php', 'mysql', 'wp']) if ((oldsitetype not in ['html', 'php', 'mysql', 'wp'])
or (oldsitetype is 'wp' and oldcachetype is 'basic')): or (oldsitetype == 'wp' and oldcachetype == 'basic')):
print(oldsitetype, oldcachetype)
Log.error(self, " Cannot update {0}, {1} {2} to wp basic" Log.error(self, "Cannot update {0} {1} {2} to wp basic"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
data = dict(site_name=ee_domain, www_domain=ee_www_domain, data = dict(site_name=ee_domain, www_domain=ee_www_domain,
@ -597,8 +597,8 @@ class EESiteUpdateController(CementBaseController):
(self.app.pargs.wpfc or self.app.pargs.wpsc)): (self.app.pargs.wpfc or self.app.pargs.wpsc)):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp'] if (oldsitetype not in ['html', 'php', 'mysql', 'wp']
or (oldsitetype is 'wp' and oldcachetype is 'w3tc')): or (oldsitetype == 'wp' and oldcachetype == 'w3tc')):
Log.error(self, " Cannot update {0}, {1} {2} to wp w3tc" Log.error(self, "Cannot update {0}, {1} {2} to wp w3tc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
data = dict(site_name=ee_domain, www_domain=ee_www_domain, data = dict(site_name=ee_domain, www_domain=ee_www_domain,
@ -616,7 +616,7 @@ class EESiteUpdateController(CementBaseController):
(self.app.pargs.wpsc or self.app.pargs.w3tc)): (self.app.pargs.wpsc or self.app.pargs.w3tc)):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp'] if (oldsitetype not in ['html', 'php', 'mysql', 'wp']
or (oldsitetype is 'wp' and oldcachetype is 'wpfc')): or (oldsitetype == 'wp' and oldcachetype == 'wpfc')):
Log.error(self, "Cannot update {0}, {1} {2} to wp wpfc" Log.error(self, "Cannot update {0}, {1} {2} to wp wpfc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -634,7 +634,7 @@ class EESiteUpdateController(CementBaseController):
(self.app.pargs.w3tc or self.app.pargs.wpfc)): (self.app.pargs.w3tc or self.app.pargs.wpfc)):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp'] if (oldsitetype not in ['html', 'php', 'mysql', 'wp']
or (oldsitetype is 'wp' and oldcachetype is 'wpsc')): or (oldsitetype == 'wp' and oldcachetype == 'wpsc')):
Log.error(self, "Cannot update {0}, {1} {2} to wp wpsc" Log.error(self, "Cannot update {0}, {1} {2} to wp wpsc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -657,7 +657,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdir'] 'wpsubdir']
or (oldsitetype is 'wpsubdir' and oldcachetype is 'basic')): or (oldsitetype == 'wpsubdir' and oldcachetype == 'basic')):
Log.error(self, " Cannot update {0}, {1} {2} " Log.error(self, " Cannot update {0}, {1} {2} "
"to wpsubdir basic" "to wpsubdir basic"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -677,7 +677,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdir'] 'wpsubdir']
or (oldsitetype is 'wpsubdir' and oldcachetype is 'w3tc')): or (oldsitetype == 'wpsubdir' and oldcachetype == 'w3tc')):
Log.error(self, " Cannot update {0} {1} {2}" Log.error(self, " Cannot update {0} {1} {2}"
"to wpsubdir w3tc" "to wpsubdir w3tc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -698,8 +698,8 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdir'] 'wpsubdir']
or (oldsitetype is 'wpsubdir' and oldcachetype is 'wpfc')): or (oldsitetype == 'wpsubdir' and oldcachetype == 'wpfc')):
Log.error(self, " Cannot update {0} {1} {2}" Log.error(self, "Cannot update {0} {1} {2}"
" to wpsubdir wpfc" " to wpsubdir wpfc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -718,7 +718,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdir'] 'wpsubdir']
or (oldsitetype is 'wpsubdir' and oldcachetype is 'wpsc')): or (oldsitetype == 'wpsubdir' and oldcachetype == 'wpsc')):
Log.error(self, " Cannot update {0} {1} {2}" Log.error(self, " Cannot update {0} {1} {2}"
" to wpsubdir wpsc" " to wpsubdir wpsc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -739,7 +739,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdomain'] 'wpsubdomain']
or (oldsitetype is 'wpsubdomain' and oldcachetype is 'basic')): or (oldsitetype == 'wpsubdomain' and oldcachetype == 'basic')):
Log.error(self, " Cannot update {0} {1} {2}" Log.error(self, " Cannot update {0} {1} {2}"
" to wpsubdomain basic" " to wpsubdomain basic"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -760,7 +760,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdomain'] or 'wpsubdomain'] or
(oldsitetype is 'wpsubdomain' and oldcachetype is 'w3tc')): (oldsitetype == 'wpsubdomain' and oldcachetype == 'w3tc')):
Log.error(self, " Cannot update {0}, {1} {2}" Log.error(self, " Cannot update {0}, {1} {2}"
" to wpsubdomain w3tc" " to wpsubdomain w3tc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -781,7 +781,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdomain'] or 'wpsubdomain'] or
(oldsitetype is 'wpsubdomain' and oldcachetype is 'wpfc')): (oldsitetype == 'wpsubdomain' and oldcachetype == 'wpfc')):
Log.error(self, " Cannot update {0}, {1} {2} " Log.error(self, " Cannot update {0}, {1} {2} "
"to wpsubdomain wpfc" "to wpsubdomain wpfc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))
@ -802,7 +802,7 @@ class EESiteUpdateController(CementBaseController):
if (oldsitetype not in ['html', 'php', 'mysql', 'wp', if (oldsitetype not in ['html', 'php', 'mysql', 'wp',
'wpsubdomain'] or 'wpsubdomain'] or
(oldsitetype is 'wpsubdomain' and oldcachetype is 'wpsc')): (oldsitetype == 'wpsubdomain' and oldcachetype == 'wpsc')):
Log.error(self, " Cannot update {0}, {1} {2}" Log.error(self, " Cannot update {0}, {1} {2}"
" to wpsubdomain wpsc" " to wpsubdomain wpsc"
.format(ee_domain, oldsitetype, oldcachetype)) .format(ee_domain, oldsitetype, oldcachetype))

Write Preview
Loading…
Cancel
Save