packages: Move pakfire_package_{g,s}et_build_host into string function

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

diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c
index bd858dcc1f35179a19d7563c292e90d3ed24ad2e..4198b8cc6ab358a13c288b5074f2ff80014f953a 100644 (file)
--- a/src/_pakfire/package.c
+++ b/src/_pakfire/package.c
@@ -353,7 +353,7 @@ static PyObject* Package_get_size(PackageObject* self) {
 }
 
 static PyObject* Package_get_buildhost(PackageObject* self) {
-       const char* build_host = pakfire_package_get_build_host(self->package);
+       const char* build_host = pakfire_package_get_string(self->package, PAKFIRE_PKG_BUILD_HOST);
        if (!build_host)
                Py_RETURN_NONE;
 
@@ -363,7 +363,7 @@ static PyObject* Package_get_buildhost(PackageObject* self) {
 static void Package_set_buildhost(PackageObject* self, PyObject* value) {
        const char* build_host = PyUnicode_FromValue(value);
 
-       pakfire_package_set_build_host(self->package, build_host);
+       pakfire_package_set_string(self->package, PAKFIRE_PKG_BUILD_HOST, build_host);
 }
 
 static PyObject* Package_get_buildtime(PackageObject* self) {

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 4d1bd41c0425d0f47770c2945c9da8efee56eb10..9221f450a54b2cd375dc70cc52ec6aef57080844 100644 (file)
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -1171,8 +1171,11 @@ static int pakfire_archive_make_package_from_json(struct pakfire_archive* archiv
 
        // Build Host
        const char* build_host = pakfire_archive_metadata_get(archive, "build", "host");
-       if (build_host)
-               pakfire_package_set_build_host(pkg, build_host);
+       if (build_host) {
+               r = pakfire_package_set_string(pkg, PAKFIRE_PKG_BUILD_HOST, build_host);
+               if (r)
+                       goto ERROR;
+       }
 
        // Build ID
        const char* build_id = pakfire_archive_metadata_get(archive, "build", "id");
@@ -1419,7 +1422,7 @@ static int pakfire_archive_make_legacy_package(struct pakfire_archive* archive,
        // Set build host
        char* build_host = pakfire_archive_get(archive, "build", "host");
        if (build_host) {
-               pakfire_package_set_build_host(pkg, build_host);
+               pakfire_package_set_string(pkg, PAKFIRE_PKG_BUILD_HOST, build_host);
                free(build_host);
        }
 

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index d31b3f366a5a01bf7d093e085a802931789b64bc..2d366d4e5ca273aeeacbfbed0bcd4e5c7e87c712 100644 (file)
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -1463,7 +1463,7 @@ int pakfire_db_add_package(struct pakfire_db* db,
        }
 
        // Bind build_host
-       const char* build_host = pakfire_package_get_build_host(pkg);
+       const char* build_host = pakfire_package_get_string(pkg, PAKFIRE_PKG_BUILD_HOST);
 
        r = sqlite3_bind_text(stmt, 15, build_host, -1, NULL);
        if (r) {
@@ -1837,7 +1837,9 @@ static int pakfire_db_load_package(struct pakfire_db* db, struct pakfire_repo* r
        // Build Host
        const char* build_host = (const char*)sqlite3_column_text(stmt, 15);
        if (build_host) {
-               pakfire_package_set_build_host(pkg, build_host);
+               r = pakfire_package_set_string(pkg, PAKFIRE_PKG_BUILD_HOST, build_host);
+               if (r)
+                       goto ERROR;
        }
 
        // Build Time

diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h
index 518c70c378d875a157da0d73c9dce22c58610513..c142a8683e51be52c3a4abec854a6d6ca29086e5 100644 (file)
--- a/src/libpakfire/include/pakfire/package.h
+++ b/src/libpakfire/include/pakfire/package.h
@@ -46,6 +46,7 @@ enum pakfire_package_key {
        PAKFIRE_PKG_DISTRO,
        PAKFIRE_PKG_MAINTAINER,
        PAKFIRE_PKG_FILENAME,
+       PAKFIRE_PKG_BUILD_HOST,
 };
 
 int pakfire_package_create(struct pakfire_package** package, struct pakfire* pakfire,
@@ -75,8 +76,6 @@ void pakfire_package_set_downloadsize(struct pakfire_package* pkg, size_t downlo
 size_t pakfire_package_get_installsize(struct pakfire_package* pkg);
 void pakfire_package_set_installsize(struct pakfire_package* pkg, size_t installsize);
 size_t pakfire_package_get_size(struct pakfire_package* pkg);
-const char* pakfire_package_get_build_host(struct pakfire_package* pkg);
-void pakfire_package_set_build_host(struct pakfire_package* pkg, const char* build_host);
 const char* pakfire_package_get_build_id(struct pakfire_package* pkg);
 void pakfire_package_set_build_id(struct pakfire_package* pkg, const char* build_id);
 time_t pakfire_package_get_build_time(struct pakfire_package* pkg);

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 54ab9480abe030b98e16d5f78295b7ee84675ef2..ede1baa8864c8486bf9346424ff45d4aed333dc4 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -167,7 +167,6 @@ global:
        pakfire_package_create;
        pakfire_package_dump;
        pakfire_package_eq;
-       pakfire_package_get_build_host;
        pakfire_package_get_build_id;
        pakfire_package_get_build_time;
        pakfire_package_get_cache_path;
@@ -197,7 +196,6 @@ global:
        pakfire_package_get_suggests;
        pakfire_package_get_supplements;
        pakfire_package_ref;
-       pakfire_package_set_build_host;
        pakfire_package_set_build_id;
        pakfire_package_set_build_time;
        pakfire_package_set_checksum;

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index bac0691d9cbc43c15e9506f111414497b1080fd0..d85770758f31e34f27ef80af2a4ef72d3e5bd163 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -395,6 +395,10 @@ PAKFIRE_EXPORT const char* pakfire_package_get_string(
                        if (!ret)
                                ret = pakfire_package_make_filename(pkg);
                        break;
+
+               case PAKFIRE_PKG_BUILD_HOST:
+                       ret = solvable_lookup_str(s, SOLVABLE_BUILDHOST);
+                       break;
        }
 
        return ret;
@@ -477,6 +481,10 @@ PAKFIRE_EXPORT int pakfire_package_set_string(
                case PAKFIRE_PKG_FILENAME:
                        id = SOLVABLE_MEDIAFILE;
                        break;
+
+               case PAKFIRE_PKG_BUILD_HOST:
+                       id = SOLVABLE_BUILDHOST;
+                       break;
        }
 
        // Check if we have found a valid ID
@@ -677,14 +685,6 @@ PAKFIRE_EXPORT size_t pakfire_package_get_size(struct pakfire_package* pkg) {
        return pakfire_package_get_downloadsize(pkg);
 }
 
-PAKFIRE_EXPORT const char* pakfire_package_get_build_host(struct pakfire_package* pkg) {
-       return pakfire_package_get_string(pkg, SOLVABLE_BUILDHOST);
-}
-
-PAKFIRE_EXPORT void pakfire_package_set_build_host(struct pakfire_package* pkg, const char* build_host) {
-       pakfire_package_set_string(pkg, SOLVABLE_BUILDHOST, build_host);
-}
-
 PAKFIRE_EXPORT const char* pakfire_package_get_build_id(struct pakfire_package* pkg) {
        return pakfire_package_get_string(pkg, SOLVABLE_BUILDVERSION);
 }
@@ -1167,8 +1167,9 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags
                pakfire_package_dump_add_line_date(&string, _("Build Time"), build_time);
 
                // Build host
-               const char* build_host = pakfire_package_get_build_host(pkg);
-               pakfire_package_dump_add_line(&string, _("Build Host"), build_host);
+               const char* build_host = pakfire_package_get_string(pkg, PAKFIRE_PKG_BUILD_HOST);
+               if (build_host)
+                       pakfire_package_dump_add_line(&string, _("Build Host"), build_host);
 
                // Dependencies
 
@@ -1564,7 +1565,7 @@ static int pakfire_package_add_build_metadata(struct pakfire_package* pkg,
                goto ERROR;
 
        // Write build host
-       const char* build_host = pakfire_package_get_build_host(pkg);
+       const char* build_host = pakfire_package_get_string(pkg, PAKFIRE_PKG_BUILD_HOST);
        if (build_host) {
                r = pakfire_json_add_string(pkg->pakfire, object, "host", build_host);
                if (r)

diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 05957b0b8f39a8c5523a4198097c8c16ea40e75e..eb6427f041276796f46d0659ecb985d7a639b24d 100644 (file)
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -116,7 +116,7 @@ int pakfire_packager_create(struct pakfire_packager** packager,
        pakfire_package_set_string(pkg, PAKFIRE_PKG_DISTRO, tag);
 
        // Set build host
-       pakfire_package_set_build_host(pkg, pakfire_hostname());
+       pakfire_package_set_string(pkg, PAKFIRE_PKG_BUILD_HOST, pakfire_hostname());
 
        // Set build time
        pakfire_package_set_build_time(pkg, p->time_created);