Commit 3f1cf151 authored by René Nussbaumer's avatar René Nussbaumer Committed by Michael Hanselmann
Browse files

Make pylint happy

I was using a too old version which doesn't got all those. This
patch is fixing the new lint errors.
Signed-off-by: default avatarRené Nussbaumer <>
Reviewed-by: default avatarMichael Hanselmann <>
parent 7b8f3fcd
......@@ -218,8 +218,7 @@ class Merger(object):
if result.failed:
logging.warning("Unable to continue watcher. Fail reason: %s;"
" output: %s" % (result.fail_reason,
" output: %s", result.fail_reason, result.output)
def _StopDaemons(self):
"""Stop all daemons on merging nodes.
......@@ -433,7 +432,7 @@ class Merger(object):
logging.critical("In order to rollback do the following:")
for step in rbsteps:
logging.critical(" * %s" % (step % info))
logging.critical(" * %s", step % info)
logging.critical("Nothing to rollback.")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment