From 3e52122f00626cae5fb6fc2d3fd7e2c67d4f60a5 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 19 Aug 2014 15:00:15 -0400 Subject: [PATCH] revert scripts/ceph-deploy Signed-off-by: Alfredo Deza --- ceph_deploy/cli.py | 2 +- scripts/ceph-deploy | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py index 2c7da85..d3f5f76 100644 --- a/ceph_deploy/cli.py +++ b/ceph_deploy/cli.py @@ -151,7 +151,7 @@ def _main(args=None, namespace=None): def main(args=None, namespace=None): try: - _main(args=None, namespace=None) + _main(args=args, namespace=namespace) finally: # This block is crucial to avoid having issues with # Python spitting non-sense thread exceptions. We have already diff --git a/scripts/ceph-deploy b/scripts/ceph-deploy index 5e2d153..cc8dd62 100755 --- a/scripts/ceph-deploy +++ b/scripts/ceph-deploy @@ -18,18 +18,4 @@ elif os.path.exists('/usr/lib/python2.6/site-packages/ceph_deploy'): from ceph_deploy.cli import main if __name__ == '__main__': - try: - sys.exit(main()) - 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 + sys.exit(main()) -- 2.47.3