]> git.ipfire.org Git - pakfire.git/commitdiff
_pakfire: keys: Treat IDs as integers
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Jun 2023 17:03:10 +0000 (17:03 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 1 Jun 2023 17:03:10 +0000 (17:03 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/_pakfire/key.c

index d92e01fe6f65967989827bd2fd2a7acdfa56ba4b..a25cba29d5d6f5ea3c19c807979588bfe0510901 100644 (file)
@@ -53,9 +53,9 @@ static void Key_dealloc(KeyObject* self) {
 }
 
 static PyObject* Key_repr(KeyObject* self) {
-       const char* id = pakfire_key_get_id(self->key);
+       const pakfire_key_id id = pakfire_key_get_id(self->key);
 
-       return PyUnicode_FromFormat("<_pakfire.Key (%s)>", id);
+       return PyUnicode_FromFormat("<_pakfire.Key (%lu)>", id);
 }
 
 static PyObject* Key_str(KeyObject* self) {
@@ -68,15 +68,9 @@ static PyObject* Key_str(KeyObject* self) {
 }
 
 static PyObject* Key_get_id(KeyObject* self) {
-       const char* id = pakfire_key_get_id(self->key);
+       const pakfire_key_id id = pakfire_key_get_id(self->key);
 
-       // Raise an error on no input
-       if (!id) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       return PyUnicode_FromString(id);
+       return PyLong_FromUnsignedLong(id);
 }
 
 static PyObject* Key_get_algorithm(KeyObject* self) {