Browse Source

Fix pagespeed backup restore

hotfix/v3.3.14
Prabuddha Chakraborty 9 years ago
parent
commit
f567686a82
  1. 8
      ee/cli/plugins/site.py
  2. 2
      ee/cli/plugins/site_functions.py

8
ee/cli/plugins/site.py

@ -855,12 +855,6 @@ class EESiteUpdateController(CementBaseController):
old_hhvm = check_site.is_hhvm
old_pagespeed = check_site.is_pagespeed
if pagespeed is old_pagespeed:
if pagespeed is False:
data['old_pagespeed'] = False
elif pagespeed is True:
data['old_pagespeed'] = True
if (pargs.password and not (pargs.html or
pargs.php or pargs.mysql or pargs.wp or
pargs.w3tc or pargs.wpfc or pargs.wpsc
@ -1126,6 +1120,8 @@ class EESiteUpdateController(CementBaseController):
Log.debug(self, str(e))
Log.error(self, "NGINX configuration check failed.")
data['old_pagespeed_status'] = check_site.is_pagespeed
try:
sitebackup(self, data)
except Exception as e:

2
ee/cli/plugins/site_functions.py

@ -618,7 +618,7 @@ def sitebackup(self, data):
.format(data['site_name']), backup_path)
if data['currsitetype'] in ['html', 'php', 'proxy', 'mysql']:
if data['pagespeed'] is True or data['old_pagespeed'] is True and not data['wp']:
if data['pagespeed'] is True or data['old_pagespeed_status'] is True and not data['wp']:
Log.info(self, "Backing up Webroot \t\t", end='')
EEFileUtils.copyfiles(self, ee_site_webroot + '/htdocs', backup_path + '/htdocs')
Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")

Loading…
Cancel
Save