From 2e13dd56639144874fb1c77792be5e7aa6b3d347 Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Wed, 22 Apr 2015 22:47:18 +0530 Subject: [PATCH] Remove space between please wait[space]... --- ee/cli/plugins/debug.py | 6 +++--- ee/cli/plugins/site.py | 2 +- ee/cli/plugins/site_functions.py | 8 ++++---- ee/cli/plugins/sync.py | 2 +- ee/cli/plugins/update.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ee/cli/plugins/debug.py b/ee/cli/plugins/debug.py index 68bc3b77..bc2c6ef5 100644 --- a/ee/cli/plugins/debug.py +++ b/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 " diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index 2796e515..6616cc5e 100644 --- a/ee/cli/plugins/site.py +++ b/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") diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 7c860662..c0462da1 100644 --- a/ee/cli/plugins/site_functions.py +++ b/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: diff --git a/ee/cli/plugins/sync.py b/ee/cli/plugins/sync.py index 2b8d6dd1..c260402f 100644 --- a/ee/cli/plugins/sync.py +++ b/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 diff --git a/ee/cli/plugins/update.py b/ee/cli/plugins/update.py index 28d383e0..8680d68e 100644 --- a/ee/cli/plugins/update.py +++ b/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))