]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Consolidate two excepts into one. 146/head
authorSandon Van Ness <sandon@inktank.com>
Fri, 8 Nov 2013 19:02:48 +0000 (11:02 -0800)
committerSandon Van Ness <sandon@inktank.com>
Fri, 8 Nov 2013 19:02:48 +0000 (11:02 -0800)
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
teuthology/misc.py

index 199ee15fdc35da64901553a0d328e82603e59c8f..02de9dfd9ea2c2a31cee2176b321c5bce909aa84 100644 (file)
@@ -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
-