From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 12 May 2017 02:38:51 +0000 (+0800)
Subject: pybind: fix cephfs.OSError initialization
X-Git-Tag: v10.2.8~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15000%2Fhead;p=ceph.git

pybind: fix cephfs.OSError initialization

Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "cephfs.pyx", line 672, in cephfs.LibCephFS.open (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:10160)
  File "cephfs.pyx", line 155, in cephfs.OSError.__init__ (/home/zhyan/Ceph/ceph-2/build/src/pybind/cephfs/pyrex/cephfs.c:1889)
TypeError: __init__() takes exactly 3 positional arguments (2 given)

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e6493f64ba4592b8dca54ece4464efa6c7f331a7)
---

diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx
index cc18fc984357..0ab2c74d1db0 100644
--- a/src/pybind/cephfs/cephfs.pyx
+++ b/src/pybind/cephfs/cephfs.pyx
@@ -322,7 +322,8 @@ cdef class LibCephFS(object):
         self.state = "uninitialized"
         if rados_inst is not None:
             if auth_id is not None or conffile is not None or conf is not None:
-                raise InvalidValue("May not pass RADOS instance as well as other configuration")
+                raise make_ex(errno.EINVAL,
+                              "May not pass RADOS instance as well as other configuration")
 
             self.create_with_rados(rados_inst)
         else:
@@ -628,8 +629,8 @@ cdef class LibCephFS(object):
                     elif access_flags > 0 and c == '+':
                         access_flags = 3;
                     else:
-                        raise OperationNotSupported(
-                            "open flags doesn't support %s" % c)
+                        raise make_ex(errno.EOPNOTSUPP,
+                                      "open flags doesn't support %s" % c)
 
                 if access_flags == 1:
                     cephfs_flags |= os.O_RDONLY;