From: Alfredo Deza <alfredo@deza.pe>
Date: Fri, 9 Aug 2013 22:39:33 +0000 (-0700)
Subject: use the new decorator in cli.py's main entry point
X-Git-Tag: v1.2~4^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8563330eded0b7e1cce815974b4b6efdca2117e;p=ceph-deploy.git

use the new decorator in cli.py's main entry point

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
---

diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py
index 0610e12..def3f6d 100644
--- a/ceph_deploy/cli.py
+++ b/ceph_deploy/cli.py
@@ -8,6 +8,7 @@ from . import exc
 from . import validate
 from . import sudo_pushy
 from .util import log
+from .util.decorators import catches
 
 LOG = logging.getLogger(__name__)
 
@@ -79,6 +80,7 @@ def parse_args(args=None, namespace=None):
     return args
 
 
+@catches((KeyboardInterrupt, RuntimeError))
 def main(args=None, namespace=None):
     args = parse_args(args=args, namespace=namespace)