From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 27 Apr 2021 11:39:39 +0000 (+0000)
Subject: package: Do not export the package Id
X-Git-Tag: 0.9.28~1285^2~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08adddfb2ad81a30a01fa9ea53c8e91df465b01a;p=pakfire.git

package: Do not export the package Id

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index f5e1d57a5..022305b0b 100644
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -76,15 +76,10 @@ static int Package_init(PackageObject* self, PyObject* args, PyObject* kwds) {
 	return 0;
 }
 
-static long Package_hash(PackageObject* self) {
-	return pakfire_package_id(self->package);
-}
-
 static PyObject* Package_repr(PackageObject* self) {
 	char* nevra = pakfire_package_get_nevra(self->package);
 
-	PyObject* repr = PyUnicode_FromFormat("<_pakfire.Package object id %ld, %s>",
-		Package_hash(self), nevra);
+	PyObject* repr = PyUnicode_FromFormat("<_pakfire.Package %s>", nevra);
 	free(nevra);
 
 	return repr;
@@ -1115,7 +1110,6 @@ PyTypeObject PackageType = {
 	tp_doc:             "Package object",
 	tp_methods:         Package_methods,
 	tp_getset:          Package_getsetters,
-	tp_hash:            (hashfunc)Package_hash,
 	tp_repr:            (reprfunc)Package_repr,
 	tp_str:             (reprfunc)Package_str,
 	tp_richcompare:     (richcmpfunc)Package_richcompare,
diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h
index 655fd4115..671ba8ec2 100644
--- a/src/libpakfire/include/pakfire/package.h
+++ b/src/libpakfire/include/pakfire/package.h
@@ -23,8 +23,6 @@
 
 #include <time.h>
 
-#include <solv/pooltypes.h>
-
 #include <pakfire/filelist.h>
 #include <pakfire/relation.h>
 #include <pakfire/relationlist.h>
@@ -41,8 +39,6 @@ int pakfire_package_identical(PakfirePackage pkg1, PakfirePackage pkg2);
 int pakfire_package_cmp(PakfirePackage pkg1, PakfirePackage pkg2);
 int pakfire_package_evr_cmp(PakfirePackage pkg1, PakfirePackage pkg2);
 
-Id pakfire_package_id(PakfirePackage pkg);
-
 char* pakfire_package_get_nevra(PakfirePackage pkg);
 const char* pakfire_package_get_name(PakfirePackage pkg);
 void pakfire_package_set_name(PakfirePackage pkg, const char* name);
@@ -155,8 +151,11 @@ enum pakfire_package_dump_flags {
 
 #ifdef PAKFIRE_PRIVATE
 
+#include <solv/pooltypes.h>
+
 PakfirePackage pakfire_package_create_from_solvable(Pakfire pakfire, Id id);
 
+Id pakfire_package_id(PakfirePackage pkg);
 int pakfire_package_is_source(PakfirePackage pkg);
 
 #endif
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 276ab9674..870664323 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -197,7 +197,6 @@ global:
 	pakfire_package_get_uuid;
 	pakfire_package_get_vendor;
 	pakfire_package_get_version;
-	pakfire_package_id;
 	pakfire_package_is_installed;
 	pakfire_package_join_evr;
 	pakfire_package_ref;
diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 6553999a4..9a6b7e4cd 100644
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -187,7 +187,7 @@ PAKFIRE_EXPORT int pakfire_package_evr_cmp(PakfirePackage pkg1, PakfirePackage p
 	return pool_evrcmp(pool, s1->evr, s2->evr, EVRCMP_COMPARE);
 }
 
-PAKFIRE_EXPORT Id pakfire_package_id(PakfirePackage pkg) {
+Id pakfire_package_id(PakfirePackage pkg) {
 	return pkg->id;
 }