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: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/tools/cluster-merge b/tools/cluster-merge
index 889d816..b31638a 100644 (file)
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -218,8 +218,7 @@ class Merger(object):
 
     if result.failed:
       logging.warning("Unable to continue watcher. Fail reason: %s;"
-                      " output: %s" % (result.fail_reason,
-                                       result.output))
+                      " 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)
       else:
         logging.critical("Nothing to rollback.")