From: Sandon Van Ness <sandon@inktank.com>
Date: Fri, 8 Nov 2013 19:02:48 +0000 (-0800)
Subject: Consolidate two excepts into one.
X-Git-Tag: 1.1.0~1777^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=03f31c6caffd569fdcc4c691dab048da4c3ced85;p=teuthology.git

Consolidate two excepts into one.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 199ee15fdc..02de9dfd9e 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -941,8 +941,5 @@ def get_distro_version(ctx):
         os_version = default_os_version[distro]
     try:
         return ctx.config['downburst'].get('distroversion', os_version)
-    except KeyError:
-        return os_version
-    except AttributeError:
+    except (KeyError, AttributeError):
         return os_version
-