openstack/trove
Code Issues Proposed changes

Fix and enable gating on H702

Browse Source 
Formatting of localized strings should be outside
the localisation call (_()), otherwise the localisation
never matches.

Change-Id: I54f482b26edf42e57116e32bbf462257cd77d155
This commit is contained in:
Dirk Mueller 2013-09-16 21:41:08 +02:00
parent 10ce3a6930
commit b3779e7eb5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/trove-manage
View File

@ -125,7 +125,7 @@ if __name__ == '__main__':
Commands().execute()
sys.exit(0)
except TypeError as e:
print _("Possible wrong number of arguments supplied %s" % e)
print _("Possible wrong number of arguments supplied %s") % e
sys.exit(2)
except Exception:
print _("Command failed, please check log for more info")

2
tox.ini
View File

@ -33,7 +33,7 @@ commands = {posargs}
[flake8]
show-source = True
ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H233,H301,H306,H401,H402,H403,H404,H702
ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H233,H301,H306,H401,H402,H403,H404
builtins = _
exclude=.venv,.tox,dist,doc,openstack,*egg,rsdns,tools,etc
filename=*.py,trove-*

2
trove/guestagent/manager/mysql.py
View File

@ -74,7 +74,7 @@ class Manager(periodic_task.PeriodicTasks):
return MySqlAdmin().is_root_enabled()
def _perform_restore(self, backup_id, context, restore_location, app):
LOG.info(_("Restoring database from backup %s" % backup_id))
LOG.info(_("Restoring database from backup %s") % backup_id)
try:
backup.restore(context, backup_id, restore_location)
except Exception as e:

2
trove/guestagent/pkg.py
View File

@ -289,7 +289,7 @@ class DebianPackagerMixin(BasePackagerMixin):
LOG.error(msg)
raise exception.GuestError(msg)
if parts[1] != package_name:
msg = _("Unexpected output:[1] = %s" % str(parts[1]))
msg = _("Unexpected output:[1] = %s") % str(parts[1])
LOG.error(msg)
raise exception.GuestError(msg)
if parts[0] == 'un' or parts[2] == '<none>':

4
trove/taskmanager/models.py
View File

@ -440,8 +440,8 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
server.status == InstanceStatus.ERROR):
LOG.error(_("Instance IP not available, "
"instance (%(instance)s): "
"server had status (%(status)s)." %
{'instance': self.id, 'status': server.status}))
"server had status (%(status)s).") %
{'instance': self.id, 'status': server.status})
raise TroveError(status=server.status)
poll_until(get_server, ip_is_available,