Merge branch 'master' into stable

Author: gau1991

CHANGELOG.txt

@@ -1,3 +1,8 @@
+v 3.1.8 - May 22, 2015
+- Fixed PHP Failed to Restart after Upgrade #550
+- Improved ee stack services command
+- Minor fix and improvements
+
 v 3.1.7 - May 21, 2015
 - Fixed site blank issue after nginx stack upgrade on Debian
 - Improved update script

ee/cli/plugins/site_functions.py

@@ -17,6 +17,7 @@
 import getpass
 import glob
 import re
+import platform
 
 
 class SiteError(Exception):
@@ -604,6 +605,8 @@ def site_package_check(self, stype):
                                     "/usr/bin/wp", "WP-CLI"]]
 
     if self.app.pargs.hhvm:
+        if platform.architecture()[0] is '32bit':
+            Log.error(self, "HHVM is not supported by 32bit system")
         Log.debug(self, "Setting apt_packages variable for HHVM")
         if not EEAptGet.is_installed(self, 'hhvm'):
             apt_packages = apt_packages + EEVariables.ee_hhvm

ee/cli/plugins/stack.py

@@ -25,6 +25,7 @@
 import pwd
 import grp
 import codecs
+import platform
 from ee.cli.plugins.stack_services import EEStackStatusController
 from ee.cli.plugins.stack_migrate import EEStackMigrateController
 from ee.cli.plugins.stack_upgrade import EEStackUpgradeController
@@ -1494,6 +1495,8 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
 
             if self.app.pargs.hhvm:
                 Log.debug(self, "Setting apt packages variable for HHVM")
+                if platform.architecture()[0] is '32bit':
+                    Log.error(self, "HHVM is not supported by 32bit system")
                 if not EEAptGet.is_installed(self, 'hhvm'):
                     apt_packages = apt_packages + EEVariables.ee_hhvm
                 else: