package: Rename pakfire_package_create to pakfire_package_create_from_solvable

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index 9df378ebaba6e7f20919dc7eedcd841bb114f32c..a725034c43e103fbd2aab5608d98d513aa9468dd 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -63,7 +63,7 @@ static int Package_init(PackageObject* self, PyObject* args, PyObject* kwds) {
        if (!PyArg_ParseTuple(args, "O!|i", &PakfireType, &pakfire, &id))
                return -1;
 
-       self->package = pakfire_package_create(pakfire->pakfire, (Id)id);
+       self->package = pakfire_package_create_from_solvable(pakfire->pakfire, (Id)id);
 
        return 0;
 }

diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h
index 81bfe31a4b1f38f2a95ef2ce78badd305b08fac1..48ab07a5c592c69949a664b637a71378be07a254 100644 (file)
--- a/src/libpakfire/include/pakfire/package.h
+++ b/src/libpakfire/include/pakfire/package.h
@@ -28,7 +28,7 @@
 #include <pakfire/relationlist.h>
 #include <pakfire/types.h>
 
-PakfirePackage pakfire_package_create(Pakfire pakfire, Id id);
+PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id);
 PakfirePackage pakfire_package_create2(Pakfire pakfire, PakfireRepo repo, const char* name, const char* evr, const char* arch);
 
 PakfirePackage pakfire_package_ref(PakfirePackage pkg);

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index f96304afcd7bc044335a91db9bc156715a3ded1f..53d96fafcd642a386d95500d9eb113d882e6dc5e 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -157,7 +157,7 @@ global:
        pakfire_package_add_requires;
        pakfire_package_add_suggests;
        pakfire_package_cmp;
-       pakfire_package_create;
+       pakfire_package_create_from_solvable;
        pakfire_package_create2;
        pakfire_package_dump;
        pakfire_package_get_arch;

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 7a42965489deae78652aef1e8a533f398a1fecad..ac0680b26358aa1d5ab5c6190fa1c7b6aa89190b 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -59,7 +59,7 @@ static void pakfire_package_add_self_provides(Pakfire pakfire, PakfirePackage pk
        pakfire_relation_unref(relation);
 }
 
-PAKFIRE_EXPORT PakfirePackage pakfire_package_create(Pakfire pakfire, Id id) {
+PAKFIRE_EXPORT PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id) {
        PakfirePackage pkg = calloc(1, sizeof(*pkg));
        if (pkg) {
                DEBUG(pakfire, "Allocated Package at %p\n", pkg);

diff --git a/src/libpakfire/packagelist.c b/src/libpakfire/packagelist.c
index a0416d33ac7e387f7a06609cd911698386b5f10e..c794daa3b30ffcd131e6dca6d833c6dfcda17cea 100644 (file)
--- a/src/libpakfire/packagelist.c
+++ b/src/libpakfire/packagelist.c
@@ -131,7 +131,7 @@ PAKFIRE_EXPORT PakfirePackageList pakfire_packagelist_from_queue(Pakfire pakfire
        Id p, pp;
        for (int i = 0; i < q->count; i += 2) {
                FOR_JOB_SELECT(p, pp, q->elements[i], q->elements[i + 1]) {
-                       PakfirePackage pkg = pakfire_package_create(pakfire, p);
+                       PakfirePackage pkg = pakfire_package_create_from_solvable(pakfire, p);
                        pakfire_packagelist_push(list, pkg);
 
                        pakfire_package_unref(pkg);

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index d614e7f8a8f5ee75bb93845bbd9bf6fcd145f1c2..eed553f9711f733e9978203eaccca11a26605763 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -366,7 +366,7 @@ static PakfirePackageList pakfire_pool_dataiterator(Pakfire pakfire, const char*
        Dataiterator di;
        dataiterator_init(&di, pakfire->pool, 0, 0, key, what, di_flags);
        while (dataiterator_step(&di)) {
-               PakfirePackage pkg = pakfire_package_create(pakfire, di.solvid);
+               PakfirePackage pkg = pakfire_package_create_from_solvable(pakfire, di.solvid);
                pakfire_packagelist_push_if_not_exists(list, pkg);
        }
        dataiterator_free(&di);
@@ -389,7 +389,7 @@ static PakfirePackageList pakfire_search_name(Pakfire pakfire, const char* name,
                        Solvable* s = pool_id2solvable(pakfire->pool, p);
 
                        if (s->name == id) {
-                               PakfirePackage pkg = pakfire_package_create(pakfire, p);
+                               PakfirePackage pkg = pakfire_package_create_from_solvable(pakfire, p);
                                pakfire_packagelist_push_if_not_exists(list, pkg);
                        }
                }
@@ -412,7 +412,7 @@ static PakfirePackageList pakfire_search_provides(Pakfire pakfire, const char* p
                Id p, pp;
                Pool* pool = pakfire->pool;
                FOR_PROVIDES(p, pp, id) {
-                       PakfirePackage pkg = pakfire_package_create(pakfire, p);
+                       PakfirePackage pkg = pakfire_package_create_from_solvable(pakfire, p);
                        pakfire_packagelist_push_if_not_exists(list, pkg);
                }
 

diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index e36360f81a822d0763575f57c089c278a7b75d78..a3d4d325e538e853f9cd095752a8a3f0d16d760f 100644 (file)
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -560,7 +560,7 @@ PAKFIRE_EXPORT int pakfire_repo_write_solv_fp(PakfireRepo repo, FILE *f, int fla
 PAKFIRE_EXPORT PakfirePackage pakfire_repo_add_package(PakfireRepo repo) {
        Id id = repo_add_solvable(repo->repo);
 
-       return pakfire_package_create(repo->pakfire, id);
+       return pakfire_package_create_from_solvable(repo->pakfire, id);
 }
 
 PAKFIRE_EXPORT PakfirePackage pakfire_repo_add_archive(PakfireRepo repo, PakfireArchive archive) {

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 19e91724c036ed28917f7254f3924af9af3e7d35..9e379dca34205e1c013fb73b4ff9db528d9120dc 100644 (file)
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -107,7 +107,7 @@ PAKFIRE_EXPORT PakfireTransaction pakfire_transaction_create(Pakfire pakfire, Tr
                        pakfire_step_type_t type = transaction_get_step_type(transaction->transaction, id);
 
                        // Fetch the package
-                       PakfirePackage pkg = pakfire_package_create(pakfire, id);
+                       PakfirePackage pkg = pakfire_package_create_from_solvable(pakfire, id);
 
                        // Append a new step
                        *steps++ = pakfire_step_create(transaction, type, pkg);