From 69d91ff06a87131f489e229018a86c91f531d15c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 6 Feb 2025 22:12:03 +0000 Subject: [PATCH] python: Fix more error codes Signed-off-by: Michael Tremer --- src/python/package.c | 6 ++++-- src/python/pakfire.c | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/python/package.c b/src/python/package.c index af2e7152..6e262b69 100644 --- a/src/python/package.c +++ b/src/python/package.c @@ -410,14 +410,16 @@ static PyObject* Package_get_reverse_requires(PackageObject* self) { // Create a new packagelist r = pakfire_packagelist_create(&list, self->ctx); - if (r) { + if (r < 0) { + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } // Search for all reverse requires r = pakfire_package_get_reverse_requires(self->package, list); - if (r) { + if (r < 0) { + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } diff --git a/src/python/pakfire.c b/src/python/pakfire.c index fe4c7cf1..48502a55 100644 --- a/src/python/pakfire.c +++ b/src/python/pakfire.c @@ -242,13 +242,15 @@ static PyObject* Pakfire_whatprovides(PakfireObject* self, PyObject* args) { // Create a new list r = pakfire_packagelist_create(&list, self->ctx); - if (r) { + if (r < 0) { + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } r = pakfire_whatprovides(self->pakfire, provides, 0, list); - if (r) { + if (r < 0) { + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } @@ -264,8 +266,8 @@ ERROR: } static PyObject* Pakfire_whatrequires(PakfireObject* self, PyObject* args) { - const char* requires = NULL; struct pakfire_packagelist* list = NULL; + const char* requires = NULL; PyObject* ret = NULL; int r; @@ -276,15 +278,17 @@ static PyObject* Pakfire_whatrequires(PakfireObject* self, PyObject* args) { // Create a new list r = pakfire_packagelist_create(&list, self->ctx); - if (r) { + if (r < 0) { Py_BLOCK_THREADS + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } r = pakfire_whatrequires(self->pakfire, requires, 0, list); - if (r) { + if (r < 0) { Py_BLOCK_THREADS + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } @@ -318,13 +322,15 @@ static PyObject* Pakfire_search(PakfireObject* self, PyObject* args, PyObject* k flags |= PAKFIRE_SEARCH_NAME_ONLY; r = pakfire_packagelist_create(&list, self->ctx); - if (r) { + if (r < 0) { + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } r = pakfire_search(self->pakfire, pattern, flags, list); - if (r) { + if (r < 0) { + errno = -r; PyErr_SetFromErrno(PyExc_OSError); goto ERROR; } -- 2.39.5