Browse Source

added check to pass options with --all option

bugfixes
harshadyeola 10 years ago
parent
commit
ad40848688
  1. 5
      config/bash_completion.d/ee_auto.rc
  2. 13
      ee/cli/plugins/site.py

5
config/bash_completion.d/ee_auto.rc

@ -262,9 +262,10 @@ _ee_complete()
"--all")
if [ ${COMP_WORDS[1]} == "clean" ]; then
retlist="--memcache --opcache --fastcgi"
else
elif [ ${COMP_WORDS[2]} == "delete" ]; then
retlist="--db --files"
else
retlist=""
fi
ret="${retlist[@]/$prev}"
COMPREPLY=( $(compgen \

13
ee/cli/plugins/site.py

@ -613,8 +613,17 @@ class EESiteUpdateController(CementBaseController):
def default(self):
pargs = self.app.pargs
if pargs.all and pargs.site_name:
Log.error(self, "`--all` option cannot be used with site name")
if pargs.all:
if pargs.site_name:
Log.error(self, "`--all` option cannot be used with site name"
" provided")
if pargs.html:
Log.error(self, "No site can be updated to html")
if not (pargs.php or
pargs.mysql or pargs.wp or pargs.wpsubdir or
pargs.wpsubdomain or pargs.w3tc or pargs.wpfc or
pargs.wpsc or pargs.hhvm or pargs.pagespeed):
Log.error(self, "Please provide options to update sites.")
if pargs.all:
sites = getAllsites(self)

Loading…
Cancel
Save