Merge branch 'updateall' of github.com:rtCamp/easyengine into updateall

ee/cli/plugins/site.py

@@ -811,11 +811,6 @@ class EESiteUpdateController(CementBaseController):
                     Log.info(self, "HHVM is allready enabled for given "
                              "site")
 
-        if pargs.pagespeed or pargs.hhvm:
-            if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
-               (stype == oldsitetype and cache == oldcachetype)):
-                return 1
-
         if data and (not pargs.hhvm):
             if old_hhvm is True:
                 data['hhvm'] = True
@@ -832,6 +827,11 @@ class EESiteUpdateController(CementBaseController):
                 data['pagespeed'] = False
                 pagespeed = False
 
+        if pargs.pagespeed or pargs.hhvm:
+            if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
+               (stype == oldsitetype and cache == oldcachetype)):
+                return 1
+
         if not data:
             Log.error(self, "Cannot update {0}, Invalid Options"
                       .format(ee_domain))