Skip to content

Commit 44251ad

Browse files
committed
fixed bugs related to hhvm update
1 parent 94ca551 commit 44251ad

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

config/bash_completion.d/ee_auto.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ _ee_complete()
239239
elif [ ${COMP_WORDS[2]} == "reset" ]; then
240240
retlist="--access --nginx --php --mysql --fpm --wp --slow-log-db"
241241

242-
243242
elif [ ${COMP_WORDS[2]} == "mail" ]; then
244243
retlist="--access --nginx --php --mysql --fpm --wp --to="
245244

ee/cli/plugins/site.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,10 @@ def doupdatesite(self, pargs):
685685
Log.info(self, "Password Unchanged.")
686686
return 0
687687

688+
if stype == "html" and self.app.pargs.hhvm:
689+
Log.info(self, Log.FAIL + "Can not update HTML site to HHVM")
690+
return 1
691+
688692
if ((stype == 'php' and oldsitetype != 'html') or
689693
(stype == 'mysql' and oldsitetype not in ['html', 'php']) or
690694
(stype == 'wp' and oldsitetype not in ['html', 'php', 'mysql',

0 commit comments

Comments
 (0)