request: Rename install/erase/upgrade functions that take a package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_pakfire/request.c b/src/_pakfire/request.c
index 1b96e40861e45aa5139e293a0b9827c8403a06d8..4a4ad16266681b27769da50146978baadc03896b 100644 (file)
--- a/src/_pakfire/request.c
+++ b/src/_pakfire/request.c
@@ -114,7 +114,7 @@ static PyObject* Request_install(RequestObject* self, PyObject* args) {
        int ret = 0;
 
        if (pkg)
-               ret = pakfire_request_install(self->request, pkg);
+               ret = pakfire_request_install_package(self->request, pkg);
 
        else if (relation)
                ret = pakfire_request_install_relation(self->request, relation);
@@ -138,7 +138,7 @@ static PyObject* Request_erase(RequestObject* self, PyObject* args) {
        int ret = 0;
 
        if (pkg)
-               ret = pakfire_request_erase(self->request, pkg, 0);
+               ret = pakfire_request_erase_package(self->request, pkg, 0);
 
        else if (selector)
                ret = pakfire_request_erase_selector(self->request, selector, 0);
@@ -159,7 +159,7 @@ static PyObject* Request_upgrade(RequestObject* self, PyObject* args) {
        int ret = 0;
 
        if (pkg)
-               ret = pakfire_request_upgrade(self->request, pkg);
+               ret = pakfire_request_upgrade_package(self->request, pkg);
 
        else if (relation)
                ret = pakfire_request_upgrade_relation(self->request, relation);

diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h
index 605a44d40536db5e870a5643f6367e27cc045e4b..cd216150b1a3c88f0fbc7fb9247dc407664a2075 100644 (file)
--- a/src/libpakfire/include/pakfire/request.h
+++ b/src/libpakfire/include/pakfire/request.h
@@ -48,22 +48,22 @@ int pakfire_request_solve(struct pakfire_request* request, int flags);
 PakfireProblem pakfire_request_get_problems(struct pakfire_request* request);
 PakfireTransaction pakfire_request_get_transaction(struct pakfire_request* request);
 
-int pakfire_request_install(struct pakfire_request* request, PakfirePackage package);
+int pakfire_request_install_package(struct pakfire_request* request, PakfirePackage package);
 int pakfire_request_install_relation(struct pakfire_request* request, PakfireRelation relation);
 int pakfire_request_install_selector(struct pakfire_request* request, PakfireSelector selector);
 
-int pakfire_request_erase(struct pakfire_request* request, PakfirePackage package, int flags);
+int pakfire_request_erase_package(struct pakfire_request* request, PakfirePackage package, int flags);
 int pakfire_request_erase_relation(struct pakfire_request* request, PakfireRelation relation, int flags);
 int pakfire_request_erase_selector(struct pakfire_request* request, PakfireSelector selector, int flags);
 
-int pakfire_request_upgrade(struct pakfire_request* request, PakfirePackage package);
+int pakfire_request_upgrade_package(struct pakfire_request* request, PakfirePackage package);
 int pakfire_request_upgrade_relation(struct pakfire_request* request, PakfireRelation relation);
 int pakfire_request_upgrade_selector(struct pakfire_request* request, PakfireSelector selector);
 
 int pakfire_request_upgrade_all(struct pakfire_request* request);
 int pakfire_request_distupgrade(struct pakfire_request* request);
 
-int pakfire_request_lock(struct pakfire_request* request, PakfirePackage package);
+int pakfire_request_lock_package(struct pakfire_request* request, PakfirePackage package);
 int pakfire_request_lock_relation(struct pakfire_request* request, PakfireRelation relation);
 int pakfire_request_lock_selector(struct pakfire_request* request, PakfireSelector selector);
 

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 3fd0fb6f9d9b707af9c6d991225d5dab202b5db1..738c31f11ea12b26a464d0c547bc51cea40d53d1 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -373,13 +373,13 @@ global:
        # request
        pakfire_request_create;
        pakfire_request_distupgrade;
-       pakfire_request_erase;
+       pakfire_request_erase_package;
        pakfire_request_erase_relation;
        pakfire_request_erase_selector;
        pakfire_request_get_pool;
        pakfire_request_get_problems;
        pakfire_request_get_transaction;
-       pakfire_request_install;
+       pakfire_request_install_package;
        pakfire_request_install_relation;
        pakfire_request_install_selector;
        pakfire_request_lock;
@@ -387,8 +387,8 @@ global:
        pakfire_request_lock_selector;
        pakfire_request_ref;
        pakfire_request_solve;
-       pakfire_request_upgrade;
        pakfire_request_upgrade_all;
+       pakfire_request_upgrade_package;
        pakfire_request_upgrade_relation;
        pakfire_request_upgrade_selector;
        pakfire_request_unref;

diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index b4aa299a318007d36566036482dbb3a3781e1b1d..36edd63c787583719b94547ce803e0bafb0abd08 100644 (file)
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -227,7 +227,7 @@ PAKFIRE_EXPORT PakfireTransaction pakfire_request_get_transaction(struct pakfire
        return pakfire_transaction_create(request->pakfire, request->transaction);
 }
 
-PAKFIRE_EXPORT int pakfire_request_install(struct pakfire_request* request, PakfirePackage package) {
+PAKFIRE_EXPORT int pakfire_request_install_package(struct pakfire_request* request, PakfirePackage package) {
        queue_push2(&request->jobs, SOLVER_SOLVABLE|SOLVER_INSTALL, pakfire_package_id(package));
 
        return 0;
@@ -250,7 +250,7 @@ static int erase_flags(int flags) {
        return additional;
 }
 
-PAKFIRE_EXPORT int pakfire_request_erase(struct pakfire_request* request, PakfirePackage package, int flags) {
+PAKFIRE_EXPORT int pakfire_request_erase_package(struct pakfire_request* request, PakfirePackage package, int flags) {
        int additional = erase_flags(flags);
        queue_push2(&request->jobs, SOLVER_SOLVABLE|SOLVER_ERASE|additional, pakfire_package_id(package));
 
@@ -269,8 +269,8 @@ PAKFIRE_EXPORT int pakfire_request_erase_selector(struct pakfire_request* reques
        return pakfire_selector2queue(selector, &request->jobs, SOLVER_ERASE|additional);
 }
 
-PAKFIRE_EXPORT int pakfire_request_upgrade(struct pakfire_request* request, PakfirePackage package) {
-       return pakfire_request_install(request, package);
+PAKFIRE_EXPORT int pakfire_request_upgrade_package(struct pakfire_request* request, PakfirePackage package) {
+       return pakfire_request_install_package(request, package);
 }
 
 PAKFIRE_EXPORT int pakfire_request_upgrade_relation(struct pakfire_request* request, PakfireRelation relation) {
@@ -293,7 +293,7 @@ PAKFIRE_EXPORT int pakfire_request_distupgrade(struct pakfire_request* request)
        return 0;
 }
 
-PAKFIRE_EXPORT int pakfire_request_lock(struct pakfire_request* request, PakfirePackage package) {
+PAKFIRE_EXPORT int pakfire_request_lock_package(struct pakfire_request* request, PakfirePackage package) {
        queue_push2(&request->jobs, SOLVER_SOLVABLE|SOLVER_LOCK, pakfire_package_id(package));
 
        return 0;