From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 20 Mar 2013 12:27:27 +0000 (+0100)
Subject: ceph-disk: fix except to catch OSError
X-Git-Tag: v0.62~188^2^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9daf6cfce2d57509d896eae28bb97146a682a306;p=ceph.git

ceph-disk: fix except to catch OSError

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 3d8116dff9ad..598693837a40 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -786,7 +786,7 @@ def prepare_dir(
     else:
         try:
             os.unlink(os.path.join(path, 'journal_dmcrypt'))
-        except:
+        except OSError:
             pass
 
     write_one_line(path, 'ceph_fsid', cluster_uuid)
@@ -1273,7 +1273,7 @@ def mount_activate(
                 parent_dev = os.stat('/var/lib/ceph/osd').st_dev
                 if dst_dev != parent_dev:
                     other = True
-        except:
+        except OSError:
             pass
         if active:
             log.info('%s osd.%s already mounted in position; unmounting ours.' % (cluster, osd_id))
@@ -1429,7 +1429,7 @@ def activate(
                 if other != init:
                     try:
                         os.unlink(os.path.join(path, other))
-                    except:
+                    except OSError:
                         pass
 
         if not os.path.exists(os.path.join(path, 'active')):