]> git.ipfire.org Git - pakfire.git/commitdiff
_pakfire: Drop request and transaction
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 Jun 2021 17:04:19 +0000 (17:04 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 Jun 2021 17:04:19 +0000 (17:04 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
src/_pakfire/_pakfiremodule.c
src/_pakfire/request.c [deleted file]
src/_pakfire/request.h [deleted file]
src/_pakfire/transaction.c [deleted file]
src/_pakfire/transaction.h [deleted file]

index 7bf4a7f3e45c604bde79642aa4e47669f0e26e61..011dd048284c1f91518bfe6561b3ce0a15f2a99d 100644 (file)
@@ -168,12 +168,8 @@ _pakfire_la_SOURCES = \
        src/_pakfire/progressbar.h \
        src/_pakfire/repo.c \
        src/_pakfire/repo.h \
-       src/_pakfire/request.c \
-       src/_pakfire/request.h \
        src/_pakfire/solution.c \
        src/_pakfire/solution.h \
-       src/_pakfire/transaction.c \
-       src/_pakfire/transaction.h \
        src/_pakfire/util.c \
        src/_pakfire/util.h
 
index f1f3e804b0ec2a7b28ee7cba72974ae92bde4c6e..34359a5287aa78696cddda317d27bb8a81ca219f 100644 (file)
@@ -32,9 +32,7 @@
 #include "problem.h"
 #include "progressbar.h"
 #include "repo.h"
-#include "request.h"
 #include "solution.h"
-#include "transaction.h"
 #include "util.h"
 
 PyObject* PyExc_BadSignatureError;
@@ -146,13 +144,6 @@ PyMODINIT_FUNC PyInit__pakfire(void) {
        Py_INCREF(&RepoType);
        PyModule_AddObject(module, "Repo", (PyObject *)&RepoType);
 
-       // Request
-       if (PyType_Ready(&RequestType) < 0)
-               return NULL;
-
-       Py_INCREF(&RequestType);
-       PyModule_AddObject(module, "Request", (PyObject *)&RequestType);
-
        // Solution
        if (PyType_Ready(&SolutionType) < 0)
                return NULL;
@@ -160,12 +151,5 @@ PyMODINIT_FUNC PyInit__pakfire(void) {
        Py_INCREF(&SolutionType);
        PyModule_AddObject(module, "Solution", (PyObject *)&SolutionType);
 
-       // Transaction
-       if (PyType_Ready(&TransactionType) < 0)
-               return NULL;
-
-       Py_INCREF(&TransactionType);
-       PyModule_AddObject(module, "Transaction", (PyObject *)&TransactionType);
-
        return module;
 }
diff --git a/src/_pakfire/request.c b/src/_pakfire/request.c
deleted file mode 100644 (file)
index 44131f6..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-/*#############################################################################
-#                                                                             #
-# Pakfire - The IPFire package management system                              #
-# Copyright (C) 2011 Pakfire development team                                 #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-#############################################################################*/
-
-#include <Python.h>
-
-#include <pakfire/request.h>
-
-#include "errors.h"
-#include "package.h"
-#include "pakfire.h"
-#include "problem.h"
-#include "request.h"
-#include "transaction.h"
-
-static PyObject* Request_new(PyTypeObject* type, PyObject* args, PyObject* kwds) {
-       RequestObject* self = (RequestObject *)type->tp_alloc(type, 0);
-       if (self) {
-               self->request = NULL;
-       }
-
-       return (PyObject *)self;
-}
-
-static void Request_dealloc(RequestObject* self) {
-       pakfire_request_unref(self->request);
-
-       Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static int Request_init(RequestObject* self, PyObject* args, PyObject* kwds) {
-       PakfireObject* pakfire;
-
-       if (!PyArg_ParseTuple(args, "O!", &PakfireType, &pakfire))
-               return -1;
-
-       int r = pakfire_request_create(&self->request, pakfire->pakfire, 0);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return -1;
-       }
-
-       return 0;
-}
-
-static PyObject* Request_install(RequestObject* self, PyObject* args) {
-       const char* what = NULL;
-
-       if (!PyArg_ParseTuple(args, "s", &what))
-               return NULL;
-
-       int r = pakfire_request_install(self->request, what, 0);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Request_erase(RequestObject* self, PyObject* args) {
-       const char* what = NULL;
-       int flags = 0;
-
-       if (!PyArg_ParseTuple(args, "s|i", &what, &flags))
-               return NULL;
-
-       int r = pakfire_request_erase(self->request, what, flags);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Request_upgrade(RequestObject* self, PyObject* args) {
-       const char* what = NULL;
-
-       if (!PyArg_ParseTuple(args, "s", &what))
-               return NULL;
-
-       int r = pakfire_request_upgrade(self->request, what, 0);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Request_upgrade_all(RequestObject* self) {
-       int r = pakfire_request_upgrade_all(self->request);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Request_sync(RequestObject* self) {
-       int r = pakfire_request_sync(self->request);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Request_verify(RequestObject* self) {
-       int r = pakfire_request_verify(self->request);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Request_get_problems(RequestObject* self) {
-       PyObject* list = PyList_New(0);
-
-       PakfireProblem problem = pakfire_request_get_problems(self->request);
-       while (problem) {
-               PyObject* p = new_problem(problem);
-               PyList_Append(list, p);
-
-               Py_DECREF(p);
-
-               // Move on to next problem
-               problem = pakfire_problem_next(problem);
-       }
-
-       return list;
-}
-
-static PyObject* Request_solve(RequestObject* self, PyObject* args, PyObject *kwds) {
-       char* kwlist[] = {"allow_archchange", "allow_downgrade", "allow_uninstall",
-               "allow_vendorchange", "without_recommends", NULL};
-
-       int allow_archchange = 0;
-       int allow_downgrade = 0;
-       int allow_uninstall = 0;
-       int allow_vendorchange = 0;
-       int without_recommends = 0;
-
-       if (!PyArg_ParseTupleAndKeywords(args, kwds, "|ppppp", kwlist,
-                       &allow_archchange, &allow_downgrade, &allow_uninstall,
-                       &allow_vendorchange, &without_recommends))
-               return NULL;
-
-       int flags = 0;
-       if (allow_archchange)
-               flags |= PAKFIRE_SOLVER_ALLOW_ARCHCHANGE;
-
-       if (allow_downgrade)
-               flags |= PAKFIRE_SOLVER_ALLOW_DOWNGRADE;
-
-       if (allow_uninstall)
-               flags |= PAKFIRE_SOLVER_ALLOW_UNINSTALL;
-
-       if (allow_vendorchange)
-               flags |= PAKFIRE_SOLVER_ALLOW_VENDORCHANGE;
-
-       if (without_recommends)
-               flags |= PAKFIRE_SOLVER_WITHOUT_RECOMMENDS;
-
-       int ret = pakfire_request_solve(self->request, flags);
-
-       // Raise a DependencyError with all problems
-       // if the request could not be solved
-       if (ret) {
-               PyObject* problems = Request_get_problems(self);
-               PyErr_SetObject(PyExc_DependencyError, problems);
-
-               Py_DECREF(problems);
-               return NULL;
-       }
-
-       // Allocate the transaction and return it
-       struct pakfire_transaction* transaction = pakfire_request_get_transaction(self->request);
-       assert(transaction);
-
-       return new_transaction(self, transaction);
-}
-
-static struct PyMethodDef Request_methods[] = {
-       {
-               "install",
-               (PyCFunction)Request_install,
-               METH_VARARGS,
-               NULL
-       },
-       {
-               "erase",
-               (PyCFunction)Request_erase,
-               METH_VARARGS,
-               NULL
-       },
-       {
-               "upgrade",
-               (PyCFunction)Request_upgrade,
-               METH_VARARGS,
-               NULL
-       },
-       {
-               "upgrade_all",
-               (PyCFunction)Request_upgrade_all,
-               METH_NOARGS,
-               NULL
-       },
-       {
-               "sync",
-               (PyCFunction)Request_sync,
-               METH_NOARGS,
-               NULL
-       },
-       {
-               "verify",
-               (PyCFunction)Request_verify,
-               METH_NOARGS,
-               NULL
-       },
-       {
-               "solve",
-               (PyCFunction)Request_solve,
-               METH_VARARGS|METH_KEYWORDS,
-               NULL
-       },
-       { NULL }
-};
-
-static struct PyGetSetDef Request_getsetters[] = {
-       {
-               "problems",
-               (getter)Request_get_problems,
-               NULL,
-               NULL,
-               NULL
-       },
-       { NULL },
-};
-
-PyTypeObject RequestType = {
-       PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Request",
-       tp_basicsize:       sizeof(RequestObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Request_new,
-       tp_dealloc:         (destructor)Request_dealloc,
-       tp_init:            (initproc)Request_init,
-       tp_doc:             "Request object",
-       tp_methods:         Request_methods,
-       tp_getset:          Request_getsetters,
-};
diff --git a/src/_pakfire/request.h b/src/_pakfire/request.h
deleted file mode 100644 (file)
index de16b63..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*#############################################################################
-#                                                                             #
-# Pakfire - The IPFire package management system                              #
-# Copyright (C) 2011 Pakfire development team                                 #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-#############################################################################*/
-
-#ifndef PYTHON_PAKFIRE_REQUEST_H
-#define PYTHON_PAKFIRE_REQUEST_H
-
-#include <Python.h>
-
-#include <pakfire/request.h>
-
-typedef struct {
-       PyObject_HEAD
-       struct pakfire_request* request;
-} RequestObject;
-
-extern PyTypeObject RequestType;
-
-#endif /* PYTHON_PAKFIRE_REQUEST_H */
diff --git a/src/_pakfire/transaction.c b/src/_pakfire/transaction.c
deleted file mode 100644 (file)
index 80a4ac9..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-/*#############################################################################
-#                                                                             #
-# Pakfire - The IPFire package management system                              #
-# Copyright (C) 2011 Pakfire development team                                 #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-#############################################################################*/
-
-#include <Python.h>
-
-#include <pakfire/package.h>
-#include <pakfire/request.h>
-#include <pakfire/transaction.h>
-
-#include "package.h"
-#include "transaction.h"
-#include "util.h"
-
-static TransactionObject* Transaction_new_core(PyTypeObject* type, RequestObject* request) {
-       TransactionObject* self = (TransactionObject *)type->tp_alloc(type, 0);
-       if (!self)
-               return NULL;
-
-       if (request) {
-               self->request = request;
-               Py_INCREF(self->request);
-       }
-
-       self->transaction = NULL;
-
-       return self;
-}
-
-PyObject* new_transaction(RequestObject* request, struct pakfire_transaction* trans) {
-       TransactionObject* transaction = Transaction_new_core(&TransactionType, request);
-       transaction->transaction = trans;
-
-       return (PyObject *)transaction;
-}
-
-static PyObject* Transaction_new(PyTypeObject* type, PyObject* args, PyObject* kwds) {
-       TransactionObject* self = Transaction_new_core(type, NULL);
-
-       return (PyObject *)self;
-}
-
-static void Transaction_dealloc(TransactionObject* self) {
-       if (self->transaction)
-               pakfire_transaction_unref(self->transaction);
-
-       Py_XDECREF(self->request);
-       Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static int Transaction_init(TransactionObject* self, PyObject* args, PyObject* kwds) {
-       RequestObject* request;
-
-       if (!PyArg_ParseTuple(args, "O!", &RequestType, &request))
-               return -1;
-
-       self->request = request;
-       Py_INCREF(self->request);
-
-       self->transaction = pakfire_request_get_transaction(request->request);
-
-       // Fail on empty transaction
-       if (!self->transaction)
-               return -1;
-
-       return 0;
-}
-
-static PyObject* Transaction_dump(TransactionObject* self) {
-       char* string = pakfire_transaction_dump(self->transaction, 80);
-       assert(string);
-
-       return PyUnicode_FromString(string);
-}
-
-static PyObject* Transaction_run(TransactionObject* self) {
-       int r = pakfire_transaction_run(self->transaction);
-
-       if (r) {
-               PyErr_SetString(PyExc_RuntimeError, "Could not run transaction");
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Transaction_download(TransactionObject* self) {
-       int r = pakfire_transaction_download(self->transaction);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static Py_ssize_t Transaction_len(TransactionObject* self) {
-       return pakfire_transaction_count(self->transaction);
-}
-
-static struct PyMethodDef Transaction_methods[] = {
-       {
-               "download",
-               (PyCFunction)Transaction_download,
-               METH_NOARGS,
-               NULL,
-       },
-       {
-               "dump",
-               (PyCFunction)Transaction_dump,
-               METH_NOARGS,
-               NULL,
-       },
-       {
-               "run",
-               (PyCFunction)Transaction_run,
-               METH_NOARGS,
-               NULL,
-       },
-       { NULL },
-};
-
-static PySequenceMethods Transaction_sequence = {
-       sq_length:          (lenfunc)Transaction_len,
-};
-
-PyTypeObject TransactionType = {
-       PyVarObject_HEAD_INIT(NULL, 0)
-       tp_name:            "_pakfire.Transaction",
-       tp_basicsize:       sizeof(TransactionObject),
-       tp_flags:           Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE,
-       tp_new:             Transaction_new,
-       tp_dealloc:         (destructor)Transaction_dealloc,
-       tp_init:            (initproc)Transaction_init,
-       tp_doc:             "Transaction object",
-       tp_methods:         Transaction_methods,
-       tp_as_sequence:     &Transaction_sequence,
-};
diff --git a/src/_pakfire/transaction.h b/src/_pakfire/transaction.h
deleted file mode 100644 (file)
index 4513cbc..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*#############################################################################
-#                                                                             #
-# Pakfire - The IPFire package management system                              #
-# Copyright (C) 2011 Pakfire development team                                 #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-#############################################################################*/
-
-#ifndef PYTHON_PAKFIRE_TRANSACTION_H
-#define PYTHON_PAKFIRE_TRANSACTION_H
-
-#include <Python.h>
-
-#include <pakfire/transaction.h>
-
-#include "request.h"
-
-typedef struct {
-       PyObject_HEAD
-       RequestObject* request;
-       struct pakfire_transaction* transaction;
-} TransactionObject;
-
-extern PyTypeObject TransactionType;
-
-PyObject* new_transaction(RequestObject* request, struct pakfire_transaction* trans);
-
-#endif /* PYTHON_PAKFIRE_TRANSACTION_H */