From: Michael Tremer Date: Sat, 23 Sep 2023 10:19:38 +0000 (+0000) Subject: transaction: Remove option to perform a dry-run X-Git-Tag: 0.9.30~1661 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2037eb6c083ba951ee836f5a1c58b3969f5ceb52;p=pakfire.git transaction: Remove option to perform a dry-run Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c index 258b3ed3d..711525d3d 100644 --- a/src/_pakfire/pakfire.c +++ b/src/_pakfire/pakfire.c @@ -427,7 +427,6 @@ ERROR: static PyObject* Pakfire_install(PakfireObject* self, PyObject* args, PyObject* kwargs) { char* kwlist[] = { "packages", - "dryrun", "without_recommended", "allow_uninstall", "allow_downgrade", @@ -435,7 +434,6 @@ static PyObject* Pakfire_install(PakfireObject* self, PyObject* args, PyObject* NULL }; char** packages = NULL; - int dryrun = 0; int without_recommended = 0; int allow_uninstall = 0; int allow_downgrade = 0; @@ -444,8 +442,8 @@ static PyObject* Pakfire_install(PakfireObject* self, PyObject* args, PyObject* PyObject* status_callback = NULL; int r; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$ppppO", kwlist, - convert_packages, &packages, &dryrun, &without_recommended, &allow_uninstall, + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$pppO", kwlist, + convert_packages, &packages, &without_recommended, &allow_uninstall, &allow_downgrade, &status_callback)) return NULL; @@ -455,9 +453,6 @@ static PyObject* Pakfire_install(PakfireObject* self, PyObject* args, PyObject* return NULL; } - // Enable dry-run mode - if (dryrun) - transaction_flags |= PAKFIRE_TRANSACTION_DRY_RUN; // Do not install recommended packages if (without_recommended) @@ -497,21 +492,19 @@ static PyObject* Pakfire_install(PakfireObject* self, PyObject* args, PyObject* static PyObject* Pakfire_erase(PakfireObject* self, PyObject* args, PyObject* kwargs) { char* kwlist[] = { "packages", - "dryrun", "keep_dependencies", "status_callback", NULL }; char** packages = NULL; - int dryrun = 0; int keep_dependencies = 0; int transaction_flags = 0; int flags = 0; PyObject* status_callback = NULL; int r; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$ppO", kwlist, - convert_packages, &packages, &dryrun, &keep_dependencies, &status_callback)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$pO", kwlist, + convert_packages, &packages, &keep_dependencies, &status_callback)) return NULL; // Check if callback is callable @@ -520,9 +513,6 @@ static PyObject* Pakfire_erase(PakfireObject* self, PyObject* args, PyObject* kw return NULL; } - if (dryrun) - transaction_flags |= PAKFIRE_TRANSACTION_DRY_RUN; - if (keep_dependencies) flags |= PAKFIRE_JOB_KEEP_DEPS; @@ -552,7 +542,6 @@ static PyObject* Pakfire_erase(PakfireObject* self, PyObject* args, PyObject* kw static PyObject* Pakfire_update(PakfireObject* self, PyObject* args, PyObject* kwargs) { char* kwlist[] = { "packages", - "dryrun", "excludes", "allow_uninstall", "allow_downgrade", @@ -561,7 +550,6 @@ static PyObject* Pakfire_update(PakfireObject* self, PyObject* args, PyObject* k }; char** packages = NULL; char** excludes = NULL; - int dryrun = 0; int allow_uninstall = 0; int allow_downgrade = 0; int solver_flags = 0; @@ -569,8 +557,8 @@ static PyObject* Pakfire_update(PakfireObject* self, PyObject* args, PyObject* k PyObject* status_callback = NULL; int r; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$pO&ppO", kwlist, - convert_packages, &packages, &dryrun, convert_packages, &excludes, + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|$O&ppO", kwlist, + convert_packages, &packages, convert_packages, &excludes, &allow_uninstall, &allow_downgrade, &status_callback)) return NULL; @@ -580,9 +568,6 @@ static PyObject* Pakfire_update(PakfireObject* self, PyObject* args, PyObject* k return NULL; } - if (dryrun) - transaction_flags |= PAKFIRE_TRANSACTION_DRY_RUN; - // Can the solver uninstall packages? if (allow_uninstall) solver_flags |= PAKFIRE_TRANSACTION_ALLOW_UNINSTALL; diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index 863f58868..8385b8000 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -2056,7 +2056,7 @@ static int pakfire_build_install_source_package( } // Run the transaction - r = pakfire_transaction_run(transaction, 0); + r = pakfire_transaction_run(transaction); if (r) goto ERROR; @@ -2209,7 +2209,7 @@ static int pakfire_build_mkimage_install_deps(struct pakfire_build* build, } // Run the transaction - r = pakfire_transaction_run(transaction, 0); + r = pakfire_transaction_run(transaction); if (r) goto ERROR; diff --git a/src/libpakfire/include/pakfire/transaction.h b/src/libpakfire/include/pakfire/transaction.h index 264f2722d..c8b988afc 100644 --- a/src/libpakfire/include/pakfire/transaction.h +++ b/src/libpakfire/include/pakfire/transaction.h @@ -85,7 +85,7 @@ char* pakfire_transaction_dump(struct pakfire_transaction* transaction, size_t w void pakfire_transaction_set_status_callback( struct pakfire_transaction* transaction, pakfire_status_callback callback, void* data); -int pakfire_transaction_run(struct pakfire_transaction* transaction, int flags); +int pakfire_transaction_run(struct pakfire_transaction* transaction); int pakfire_transaction_download(struct pakfire_transaction* transaction); diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index 2b1691dff..3c8466587 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -1959,7 +1959,7 @@ static int pakfire_perform_transaction( *changed = pakfire_transaction_count(transaction); // Run the transaction - r = pakfire_transaction_run(transaction, transaction_flags); + r = pakfire_transaction_run(transaction); if (r) goto ERROR; @@ -2058,7 +2058,7 @@ static int pakfire_perform_transaction_simple(struct pakfire* pakfire, int solve *changed = pakfire_transaction_count(transaction); // Run the transaction - r = pakfire_transaction_run(transaction, 0); + r = pakfire_transaction_run(transaction); if (r) goto ERROR; diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index 3c7ea113c..841ed0b87 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -1963,8 +1963,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_transaction_run( - struct pakfire_transaction* transaction, int flags) { +PAKFIRE_EXPORT int pakfire_transaction_run(struct pakfire_transaction* transaction) { char* dump = NULL; int r; @@ -1996,10 +1995,6 @@ PAKFIRE_EXPORT int pakfire_transaction_run( if (r) goto ERROR; - // End here for a dry run - if (flags & PAKFIRE_TRANSACTION_DRY_RUN) - goto ERROR; - // Download what we need r = pakfire_transaction_download(transaction); if (r)