Browse Source

Remove space between please wait[space]...

bugfixes
Mitesh Shah 10 years ago
parent
commit
2e13dd5663
  1. 6
      ee/cli/plugins/debug.py
  2. 2
      ee/cli/plugins/site.py
  3. 8
      ee/cli/plugins/site_functions.py
  4. 2
      ee/cli/plugins/sync.py
  5. 2
      ee/cli/plugins/update.py

6
ee/cli/plugins/debug.py

@ -505,7 +505,7 @@ class EEDebugController(CementBaseController):
"'ee debug --import-slow-log'"):
if not cron_time == 0:
Log.info(self, "setting up crontab entry,"
" please wait ...")
" please wait...")
EEShellExec.cmd_exec(self, "/bin/bash -c \"crontab -l "
"2> /dev/null | {{ cat; echo -e"
" \\\"#EasyEngine start MySQL "
@ -518,7 +518,7 @@ class EEDebugController(CementBaseController):
else:
if not cron_time == 0:
Log.info(self, "updating crontab entry,"
" please wait ...")
" please wait...")
if not EEShellExec.cmd_exec(self, "/bin/bash -c "
"\"crontab "
"-l | sed '/EasyEngine "
@ -533,7 +533,7 @@ class EEDebugController(CementBaseController):
Log.error(self, "failed to update crontab entry")
else:
Log.info(self, "removing crontab entry,"
" please wait ...")
" please wait...")
if not EEShellExec.cmd_exec(self, "/bin/bash -c "
"\"crontab "
"-l | sed '/EasyEngine "

2
ee/cli/plugins/site.py

@ -633,7 +633,7 @@ class EESiteUpdateController(CementBaseController):
for site in sites:
pargs.site_name = site.sitename
Log.info(self, Log.ENDC + Log.BOLD + "Updating site {0},"
" please wait ..."
" please wait..."
.format(pargs.site_name))
self.doupdatesite(pargs)
print("\n")

8
ee/cli/plugins/site_functions.py

@ -31,7 +31,7 @@ class SiteError(Exception):
def pre_run_checks(self):
# Check nginx configuration
Log.info(self, "Running pre-update checks, please wait ...")
Log.info(self, "Running pre-update checks, please wait...")
try:
Log.debug(self, "checking NGINX configuration ...")
FNULL = open('/dev/null', 'w')
@ -78,7 +78,7 @@ def setupdomain(self, data):
finally:
# Check nginx -t and return status over it
try:
Log.debug(self, "Checking generated nginx conf, please wait ...")
Log.debug(self, "Checking generated nginx conf, please wait...")
FNULL = open('/dev/null', 'w')
ret = subprocess.check_call(["nginx", "-t"], stdout=FNULL,
stderr=subprocess.STDOUT)
@ -456,7 +456,7 @@ def setupwordpressnetwork(self, data):
def installwp_plugin(self, plugin_name, data):
ee_site_webroot = data['webroot']
Log.info(self, "Installing plugin {0}, please wait ..."
Log.info(self, "Installing plugin {0}, please wait..."
.format(plugin_name))
EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot))
try:
@ -480,7 +480,7 @@ def installwp_plugin(self, plugin_name, data):
def uninstallwp_plugin(self, plugin_name, data):
ee_site_webroot = data['webroot']
Log.debug(self, "Uninstalling plugin {0}, please wait ..."
Log.debug(self, "Uninstalling plugin {0}, please wait..."
.format(plugin_name))
EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot))
try:

2
ee/cli/plugins/sync.py

@ -28,7 +28,7 @@ class EESyncController(CementBaseController):
1. reads database information from wp/ee-config.php
2. updates records into ee database accordingly.
"""
Log.info(self, "Synchronizing ee database, please wait ....")
Log.info(self, "Synchronizing ee database, please wait...")
sites = getAllsites(self)
if not sites:
pass

2
ee/cli/plugins/update.py

@ -28,7 +28,7 @@ class EEUpdateController(CementBaseController):
"/tmp/{0}".format(filename),
"update script"]])
try:
Log.info(self, "updating EasyEngine, please wait ...")
Log.info(self, "updating EasyEngine, please wait...")
os.system("bash /tmp/{0}".format(filename))
except OSError as e:
Log.debug(self, str(e))

Loading…
Cancel
Save