From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Apr 2021 11:31:02 +0000 (+0000)
Subject: package: Make pakfire_package_create_from_solvable private
X-Git-Tag: 0.9.28~1285^2~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e7800fbbe834e0d6ea2c579502a4a9684b59815;p=pakfire.git

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 efd9fb7e1..f5e1d57a5 100644
--- 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 2e3cdfba6..655fd4115 100644
--- 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 d1225162c..276ab9674 100644
--- 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 1c7bfcee4..aabf7ef04 100644
--- 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;