From 5b27346a04dcfffff5e6c68618f37862ed17822e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Thu, 9 Sep 2010 13:13:08 +0200
Subject: [PATCH] If we had any errors in setup in one of the hosts, exit with
non-zero
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
tools/setup-ssh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/setup-ssh b/tools/setup-ssh
index e5a512bf1..c6c0bd625 100755
--- a/tools/setup-ssh
+++ b/tools/setup-ssh
@@ -304,6 +304,8 @@ def main():
SetupLogging(options)
+ errs = 0
+
all_keys = LoadPrivateKeys(options)
passwd = None
@@ -345,14 +347,18 @@ def main():
SetupSSH(transport)
SetupNodeDaemon(transport)
except errors.GenericError, err:
- logging.error("While doing setup on host %s an error occured: %s",
+ logging.error("While doing setup on host %s an error occurred: %s",
host, err)
+ errs += 1
finally:
transport.close()
# this is needed for compatibility with older Paramiko or Python
# versions
transport.join()
+ if errs > 0:
+ sys.exit(1)
+
if __name__ == "__main__":
main()
--
GitLab