]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: fix get_ceph_user
authorSage Weil <sage@redhat.com>
Wed, 12 Aug 2015 20:43:38 +0000 (16:43 -0400)
committerSage Weil <sage@redhat.com>
Thu, 27 Aug 2015 00:35:14 +0000 (20:35 -0400)
getpwnam throws an exception

Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-disk

index 20be6673ff3dfd5f567c06d6c496132c719a43cd..d7b3233cff5c7e76f6db18767c98772693c38545 100755 (executable)
@@ -713,9 +713,11 @@ def get_osd_id(path):
     return osd_id
 
 def get_ceph_user():
-    if pwd.getpwnam('ceph') and grp.getgrnam('ceph'):
+    try:
+        pwd.getpwnam('ceph')
+        grp.getgrnam('ceph')
         return 'ceph'
-    else:
+    except KeyError:
         return 'root'
 
 def path_set_context(path):