ceph-disk: make exception handling terse in main_activate_journal

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 908348b8047e8577ecf9133f2683f91423694416)

diff --git a/src/ceph-disk b/src/ceph-disk
index b2e183e1721ba2e13a28f9d8c4ed7b1f53848703..900464163a76400cfbdaa984cc214970fa773f31 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1893,12 +1893,9 @@ def main_activate_journal(args):
             osd_id=osd_id,
             )
 
+    finally:
         activate_lock.release()
 
-    except:
-        activate_lock.release()
-        raise
-
 ###########################
 
 def main_activate_all(args):