From 280ecaa453f7081d969674d75669eec718f892ac Mon Sep 17 00:00:00 2001 From: Dylan Martin Date: Thu, 10 Oct 2013 09:15:47 -0700 Subject: [PATCH] toned down the error message for unconfigured master/slave --- database/mysql_replication | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/database/mysql_replication b/database/mysql_replication index 59116dab239..80ecf449f85 100644 --- a/database/mysql_replication +++ b/database/mysql_replication @@ -305,15 +305,15 @@ def main(): masterstatus = get_master_status(cursor) try: module.exit_json( **masterstatus ) - except TypeError, e: - module.fail_json(msg="Server is not configured as mysql master: %s" % e) + except TypeError: + module.fail_json(msg="Server is not configured as mysql master") elif mode in "getslave": slavestatus = get_slave_status(cursor) try: module.exit_json( **slavestatus ) - except TypeError, e: - module.fail_json(msg="Server is not configured as mysql slave: %s" % e) + except TypeError: + module.fail_json(msg="Server is not configured as mysql slave") elif mode in "changemaster": print "Change master"