From 5571a18c8dfb1564a16432ecd41c3b28f86b8e43 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 26 Oct 2017 10:58:22 +0100 Subject: [PATCH] Add .stestr to .gitignore Change-Id: I855d30318cfadade0cb57330efea66f752776216 --- .gitignore | 1 + src/lib/charm/openstack/barbican.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a68c28d..98c9c5a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ interfaces trusty .testrepository __pycache__ +.stestr diff --git a/src/lib/charm/openstack/barbican.py b/src/lib/charm/openstack/barbican.py index 91ca06d..db2def8 100644 --- a/src/lib/charm/openstack/barbican.py +++ b/src/lib/charm/openstack/barbican.py @@ -90,7 +90,7 @@ def library_path(hsm): """Provide a library_path property to the template if it exists""" try: return hsm.relation.plugin_data['library_path'] - except: + except Exception: return '' @@ -99,7 +99,7 @@ def login(hsm): """Provide a login property to the template if it exists""" try: return hsm.relation.plugin_data['login'] - except: + except Exception: return '' @@ -108,7 +108,7 @@ def slot_id(hsm): """Provide a slot_id property to the template if it exists""" try: return hsm.relation.plugin_data['slot_id'] - except: + except Exception: return ''