From 3f1cf1515e55d6e9c9b9ff2e22dab0b05bb92017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Fri, 26 Feb 2010 14:12:39 +0100
Subject: [PATCH] Make pylint happy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
tools/cluster-merge | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index 889d81644..b31638a97 100644
--- 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.")
--
GitLab