package: Make pakfire_package_create_from_solvable private

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index efd9fb7e1f2768c271d61120021ed21335a9ac6b..f5e1d57a5b044f48b7f7fd94524bbb99ec404c9e 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -58,12 +58,20 @@ static void Package_dealloc(PackageObject* self) {
 
 static int Package_init(PackageObject* self, PyObject* args, PyObject* kwds) {
        PakfireObject* pakfire;
-       int id = 0;
+       RepoObject* repo;
+       const char* name = NULL;
+       const char* evr = NULL;
+       const char* arch = NULL;
 
-       if (!PyArg_ParseTuple(args, "O!|i", &PakfireType, &pakfire, &id))
+       if (!PyArg_ParseTuple(args, "O!O!sss", &PakfireType, &pakfire, &RepoType, &repo,
+                       &name, &evr, &arch))
                return -1;
 
-       self->package = pakfire_package_create_from_solvable(pakfire->pakfire, (Id)id);
+       self->package = pakfire_package_create(pakfire->pakfire, repo->repo, name, evr, arch);
+       if (!self->package) {
+               PyErr_SetFromErrno(PyExc_OSError);
+               return -1;
+       }
 
        return 0;
 }

diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h
index 2e3cdfba627e84d7a173f66c87aa349f8932a74d..655fd4115895277efe54fa6c31b8bd6eb9fb3f49 100644 (file)
--- a/src/libpakfire/include/pakfire/package.h
+++ b/src/libpakfire/include/pakfire/package.h
@@ -30,8 +30,8 @@
 #include <pakfire/relationlist.h>
 #include <pakfire/types.h>
 
-PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id);
-PakfirePackage pakfire_package_create(Pakfire pakfire, PakfireRepo repo, const char* name, const char* evr, const char* arch);
+PakfirePackage pakfire_package_create(Pakfire pakfire, PakfireRepo repo,
+       const char* name, const char* evr, const char* arch);
 
 PakfirePackage pakfire_package_ref(PakfirePackage pkg);
 PakfirePackage pakfire_package_unref(PakfirePackage pkg);
@@ -155,6 +155,8 @@ enum pakfire_package_dump_flags {
 
 #ifdef PAKFIRE_PRIVATE
 
+PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id);
+
 int pakfire_package_is_source(PakfirePackage pkg);
 
 #endif

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index d1225162cb035b08719c8a85a986b2dba447bdd3..276ab96746596f414ec11df0648a885f342451bd 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -158,7 +158,6 @@ global:
        pakfire_package_add_suggests;
        pakfire_package_cmp;
        pakfire_package_create;
-       pakfire_package_create_from_solvable;
        pakfire_package_dump;
        pakfire_package_get_arch;
        pakfire_package_get_build_host;

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 1c7bfcee43788e2b755e0588ea4a3fb96ab8a67d..aabf7ef04c10127a220e72acf38e57df6173692b 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_from_solvable(Pakfire pakfire, Id id) {
+PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id) {
        PakfirePackage pkg = calloc(1, sizeof(*pkg));
        if (!pkg)
                return NULL;