Resolve pylint message W1201
W1201: Specify string format arguments as logging function
parameters (logging-not-lazy)
Change-Id: I618aa814fac01cedc3a590fc129da56b3f4e09f5
diff --git a/container-images/gerrit-init/tools/gerrit_init.py b/container-images/gerrit-init/tools/gerrit_init.py
index 299ed00..3a0ef32 100755
--- a/container-images/gerrit-init/tools/gerrit_init.py
+++ b/container-images/gerrit-init/tools/gerrit_init.py
@@ -75,7 +75,7 @@
def _remove_unwanted_plugins(self):
for plugin in self.installed_plugins.difference(self.wanted_plugins):
- LOG.info("Removing plugin %s" % plugin)
+ LOG.info("Removing plugin %s", plugin)
os.remove(os.path.join(self.site, "plugins", "%s.jar" % plugin))
def _needs_init(self):
@@ -88,9 +88,7 @@
provided_version = self._get_gerrit_version("/var/war/gerrit.war")
if installed_version != provided_version:
LOG.info("New Gerrit version was provided (current: %s; new: %s). "
- "Reinitializing site." % (
- installed_version,
- provided_version))
+ "Reinitializing site.", installed_version, provided_version)
return True
if self.wanted_plugins.difference(self.installed_plugins):
@@ -131,7 +129,7 @@
init_process = subprocess.run(command.split(), stdout=subprocess.PIPE)
if init_process.returncode > 0:
- LOG.error("An error occured, when initializing Gerrit. Exit code: %d" %
+ LOG.error("An error occured, when initializing Gerrit. Exit code: %d",
init_process.returncode)
sys.exit(1)
diff --git a/container-images/gerrit-init/tools/validate_db.py b/container-images/gerrit-init/tools/validate_db.py
index e846b3a..f87d637 100755
--- a/container-images/gerrit-init/tools/validate_db.py
+++ b/container-images/gerrit-init/tools/validate_db.py
@@ -162,7 +162,7 @@
LOG.info("Waiting for database schema to be created...")
for table in self.tables:
while not self.engine.dialect.has_table(self.engine, table):
- LOG.info("Still waiting for table %s..." % table)
+ LOG.info("Still waiting for table %s...", table)
time.sleep(3)
LOG.info("Schema appears to have been created!")
