Browse Source

Fix raise exception on setup wordpress tables fail

feature/refactor-php
prabuddha 10 years ago
parent
commit
be8cb41bcd
  1. 14
      ee/cli/plugins/site_functions.py

14
ee/cli/plugins/site_functions.py

@ -420,7 +420,7 @@ def setupwordpress(self, data):
+ "--admin_password= --admin_email=\'{1}\'" + "--admin_password= --admin_email=\'{1}\'"
.format(ee_wp_pass, ee_wp_email)) .format(ee_wp_pass, ee_wp_email))
try: try:
EEShellExec.cmd_exec(self, "php {0} --allow-root core " if EEShellExec.cmd_exec(self, "php {0} --allow-root core "
.format(EEVariables.ee_wpcli_path) .format(EEVariables.ee_wpcli_path)
+ "install --url=\'{0}\' --title=\'{0}\' " + "install --url=\'{0}\' --title=\'{0}\' "
"--admin_name=\'{1}\' " "--admin_name=\'{1}\' "
@ -428,7 +428,10 @@ def setupwordpress(self, data):
+ "--admin_password=\'{0}\' " + "--admin_password=\'{0}\' "
"--admin_email=\'{1}\'" "--admin_email=\'{1}\'"
.format(ee_wp_pass, ee_wp_email), .format(ee_wp_pass, ee_wp_email),
log=False) log=False):
pass
else:
raise SiteError("setup wordpress tables failed for single site")
except CommandExecutionError as e: except CommandExecutionError as e:
raise SiteError("setup wordpress tables failed for single site") raise SiteError("setup wordpress tables failed for single site")
else: else:
@ -444,7 +447,7 @@ def setupwordpress(self, data):
subdomains='--subdomains' subdomains='--subdomains'
if not data['wpsubdir'] else '')) if not data['wpsubdir'] else ''))
try: try:
EEShellExec.cmd_exec(self, "php {0} --allow-root " if EEShellExec.cmd_exec(self, "php {0} --allow-root "
.format(EEVariables.ee_wpcli_path) .format(EEVariables.ee_wpcli_path)
+ "core multisite-install " + "core multisite-install "
"--url=\'{0}\' --title=\'{0}\' " "--url=\'{0}\' --title=\'{0}\' "
@ -456,7 +459,10 @@ def setupwordpress(self, data):
.format(ee_wp_pass, ee_wp_email, .format(ee_wp_pass, ee_wp_email,
subdomains='--subdomains' subdomains='--subdomains'
if not data['wpsubdir'] else ''), if not data['wpsubdir'] else ''),
log=False) log=False):
pass
else:
raise SiteError("setup wordpress tables failed for wp multi site")
except CommandExecutionError as e: except CommandExecutionError as e:
raise SiteError("setup wordpress tables failed for wp multi site") raise SiteError("setup wordpress tables failed for wp multi site")

Loading…
Cancel
Save