Merge branch 'master' of github.com:rtCamp/easyengine

ee/cli/plugins/site.py

@@ -718,23 +718,28 @@ class EESiteUpdateController(CementBaseController):
                 pagespeed = False
 
         if self.app.pargs.pagespeed:
-            if pagespeed == old_pagespeed:
+            if pagespeed is old_pagespeed:
                 if pagespeed is False:
-                    Log.error(self, "Pagespeed is allready disabled for given "
+                    Log.info(self, "Pagespeed is allready disabled for given "
                              "site")
                 elif pagespeed is True:
-                    Log.error(self, "Pagespeed is allready enabled for given "
+                    Log.info(self, "Pagespeed is allready enabled for given "
                              "site")
 
         if self.app.pargs.hhvm:
-            if hhvm == old_hhvm:
+            if hhvm is old_hhvm:
                 if hhvm is False:
-                    Log.error(self, "HHVM is allready disabled for given "
+                    Log.info(self, "HHVM is allready disabled for given "
                              "site")
                 elif hhvm is True:
-                    Log.error(self, "HHVM is allready enabled for given "
+                    Log.info(self, "HHVM is allready enabled for given "
                              "site")
 
+        if self.app.pargs.pagespeed and self.app.pargs.hhvm:
+            if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
+               (stype == oldsitetype and cache == oldcachetype)):
+                self.app.close(0)
+
         if data and (not self.app.pargs.hhvm):
             if old_hhvm is True:
                 data['hhvm'] = True

ee/cli/plugins/stack.py

@@ -1667,11 +1667,23 @@ class EEStackController(CementBaseController):
                                    .format(EEVariables.ee_webroot)]
 
         if len(apt_packages):
+            if not self.app.pargs.no_prompt:
+                ee_apt_pkg_prompt = input('Are you sure, you want to remove'
+                                          ' packages [y/N]: ')
+            else:
+                ee_apt_pkg_prompt = 'Y'
+            if ee_apt_pkg_prompt == 'Y' or ee_apt_pkg_prompt == 'y':
                 Log.debug(self, "Removing apt_packages")
                 Log.info(self, "Uninstalling packages, please wait ...")
                 EEAptGet.remove(self, apt_packages)
                 EEAptGet.auto_remove(self)
         if len(packages):
+            if not self.app.pargs.no_prompt:
+                ee_pkg_prompt = input('Are you sure, you want to remove'
+                                      ' packages [y/N]: ')
+            else:
+                ee_pkg_prompt = 'Y'
+            if ee_pkg_prompt == 'Y' or ee_pkg_prompt == 'y':
                 EEFileUtils.remove(self, packages)
                 EEAptGet.auto_remove(self)
         Log.info(self, "Successfully removed packages")
@@ -1768,10 +1780,22 @@ class EEStackController(CementBaseController):
                                    ]
 
         if len(apt_packages):
+            if not self.app.pargs.no_prompt:
+                ee_apt_pkg_prompt = input('Are you sure, you want to remove'
+                                          ' packages [y/N]: ')
+            else:
+                ee_apt_pkg_prompt = 'Y'
+            if ee_apt_pkg_prompt == 'Y' or ee_apt_pkg_prompt == 'y':
                 Log.info(self, "Uninstalling packages, please wait ...")
                 EEAptGet.remove(self, apt_packages, purge=True)
                 EEAptGet.auto_remove(self)
         if len(packages):
+            if not self.app.pargs.no_prompt:
+                ee_pkg_prompt = input('Are you sure, you want to remove'
+                                      ' packages [y/N]: ')
+            else:
+                ee_pkg_prompt = 'Y'
+            if ee_pkg_prompt == 'Y' or ee_pkg_prompt == 'y':
                 EEFileUtils.remove(self, packages)
                 EEAptGet.auto_remove(self)
         Log.info(self, "Successfully purged packages")