From 50cb20a98a5928beba548adf4bfba36935f945fc Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 19 Aug 2014 14:57:49 -0400 Subject: [PATCH] rename main to _main to avoid fixing scripts Signed-off-by: Alfredo Deza --- ceph_deploy/cli.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py index a6dfead..2c7da85 100644 --- a/ceph_deploy/cli.py +++ b/ceph_deploy/cli.py @@ -99,7 +99,7 @@ def get_parser(): @catches((KeyboardInterrupt, RuntimeError, exc.DeployError,), handle_all=True) -def main(args=None, namespace=None): +def _main(args=None, namespace=None): parser = get_parser() if len(sys.argv) < 2: @@ -147,3 +147,21 @@ def main(args=None, namespace=None): ) return args.func(args) + + +def main(args=None, namespace=None): + try: + _main(args=None, namespace=None) + finally: + # This block is crucial to avoid having issues with + # Python spitting non-sense thread exceptions. We have already + # handled what we could, so close stderr and stdout. + if not os.environ.get('CEPH_DEPLOY_TEST'): + try: + sys.stdout.close() + except: + pass + try: + sys.stderr.close() + except: + pass -- 2.47.3