diff options
| author | Giuseppe Scrivano | 2017-09-21 23:18:30 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano | 2017-09-21 23:18:32 +0200 |
| commit | f218d8d2f53633ea5c2afde211e4e2ad6ce486e9 (patch) | |
| tree | ad5f8ba7042f220f43dbe082958d38f953d695d7 /libmount/python | |
| parent | po: fix ipcrm translation error fr.po (diff) | |
| download | kernel-qcow2-util-linux-f218d8d2f53633ea5c2afde211e4e2ad6ce486e9.tar.gz kernel-qcow2-util-linux-f218d8d2f53633ea5c2afde211e4e2ad6ce486e9.tar.xz kernel-qcow2-util-linux-f218d8d2f53633ea5c2afde211e4e2ad6ce486e9.zip | |
libmount: fix Python get_propagation
The current implementation would return always 0, as it is the return
code of mnt_fs_get_propagation. Change the implementation to raise an
exception on an error and return the propagation flags otherwise.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libmount/python')
| -rw-r--r-- | libmount/python/fs.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libmount/python/fs.c b/libmount/python/fs.c index 872a9f29e..d6490d248 100644 --- a/libmount/python/fs.c +++ b/libmount/python/fs.c @@ -404,16 +404,13 @@ in mountinfo file. The kernel default is MS_PRIVATE, this flag is not stored\n\ in the mountinfo file.\n\ \n\ Returns self or raises an exception in case of an error." -static PyObject *Fs_get_propagation(FsObject *self, PyObject *args, PyObject *kwds) +static PyObject *Fs_get_propagation(FsObject *self) { unsigned long flags; - char *kwlist[] = {"flags", NULL}; + int rc; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "k", kwlist, &flags)) { - PyErr_SetString(PyExc_TypeError, ARG_ERR); - return NULL; - } - return PyObjectResultInt(mnt_fs_get_propagation(self->fs, &flags)); + rc = mnt_fs_get_propagation(self->fs, &flags); + return rc ? UL_RaiseExc(-rc) : PyObjectResultInt(flags); } static PyObject *Fs_get_tid(FsObject *self) @@ -589,7 +586,7 @@ static PyObject *Fs_streq_target(FsObject *self, PyObject *args, PyObject *kwds) static PyObject *Fs_copy_fs(FsObject *self, PyObject *args, PyObject *kwds); static PyMethodDef Fs_methods[] = { - {"get_propagation", (PyCFunction)Fs_get_propagation, METH_VARARGS|METH_KEYWORDS, Fs_get_propagation_HELP}, + {"get_propagation", (PyCFunction)Fs_get_propagation, METH_NOARGS, Fs_get_propagation_HELP}, {"mnt_fs_append_attributes", (PyCFunction)Fs_append_attributes, METH_VARARGS|METH_KEYWORDS, Fs_append_attributes_HELP}, {"append_options", (PyCFunction)Fs_append_options, METH_VARARGS|METH_KEYWORDS, Fs_append_options_HELP}, {"mnt_fs_prepend_attributes", (PyCFunction)Fs_prepend_attributes, METH_VARARGS|METH_KEYWORDS, Fs_prepend_attributes_HELP}, |