packager: Explicitely pass struct pakfire on create

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

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 88f173651a1d32fa7601b5f0d855672bcbe3925c..d3cf93d5563ae5454f74af82b7e8b1e1f85a89de 100644 (file)
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -480,7 +480,7 @@ static int pakfire_build_package(struct pakfire* pakfire, struct pakfire_parser*
        pakfire_package_set_build_id_from_uuid(pkg, build_id);
 
        // Create a packager
-       r = pakfire_packager_create(&packager, pkg);
+       r = pakfire_packager_create(&packager, pakfire, pkg);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/dist.c b/src/libpakfire/dist.c
index de4c1ef20855a30b9ff5baa0d2110b47cdacd8ce..94664778c624988068c0c9c178abded7b2f043c7 100644 (file)
--- a/src/libpakfire/dist.c
+++ b/src/libpakfire/dist.c
@@ -393,7 +393,7 @@ PAKFIRE_EXPORT int pakfire_dist(struct pakfire* pakfire, const char* path,
                goto ERROR;
 
        // Create a packager
-       r = pakfire_packager_create(&packager, pkg);
+       r = pakfire_packager_create(&packager, pakfire, pkg);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/include/pakfire/packager.h b/src/libpakfire/include/pakfire/packager.h
index 473367db18db91f5cda56cb0d42e0ca6a2a52906..5e147a76e9169519a22ef7dc58e04a2e7519a2ff 100644 (file)
--- a/src/libpakfire/include/pakfire/packager.h
+++ b/src/libpakfire/include/pakfire/packager.h
@@ -28,7 +28,8 @@
 
 struct pakfire_packager;
 
-int pakfire_packager_create(struct pakfire_packager** packager, struct pakfire_package* pkg);
+int pakfire_packager_create(struct pakfire_packager** packager,
+       struct pakfire* pakfire, struct pakfire_package* pkg);
 
 struct pakfire_packager* pakfire_packager_ref(struct pakfire_packager* packager);
 struct pakfire_packager* pakfire_packager_unref(struct pakfire_packager* packager);

diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 3bf81a50658757ba4cd90106d23d98d3027e65cd..ac8e71d4be00786e5619dabb0ec25290d8786554 100644 (file)
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -258,7 +258,7 @@ static void pakfire_packager_free(struct pakfire_packager* packager) {
 }
 
 int pakfire_packager_create(struct pakfire_packager** packager,
-               struct pakfire_package* pkg) {
+               struct pakfire* pakfire, struct pakfire_package* pkg) {
        struct pakfire_packager* p = calloc(1, sizeof(*p));
        if (!p)
                return ENOMEM;
@@ -272,7 +272,7 @@ int pakfire_packager_create(struct pakfire_packager** packager,
        p->nrefs = 1;
 
        // Store a reference to Pakfire
-       p->pakfire = pakfire_package_get_pakfire(pkg);
+       p->pakfire = pakfire_ref(pakfire);
 
        // Store a reference to the package
        p->pkg = pakfire_package_ref(pkg);

diff --git a/tests/libpakfire/packager.c b/tests/libpakfire/packager.c
index f538b9db8f66fef6ae44ba648ac24713af7e0917..39aabb41b7642da7f10a6ee9d3e806e492e6d32e 100644 (file)
--- a/tests/libpakfire/packager.c
+++ b/tests/libpakfire/packager.c
@@ -41,7 +41,7 @@ static int test_create(const struct test* t) {
        ASSERT(pkg);
 
        // Create packager
-       ASSERT_SUCCESS(pakfire_packager_create(&packager, pkg));
+       ASSERT_SUCCESS(pakfire_packager_create(&packager, t->pakfire, pkg));
 
        // Add a file to the package
        const char* path = TEST_SRC_PATH "data/beep-1.3-2.ip3.x86_64.pfm";
@@ -89,7 +89,7 @@ static int test_compare_metadata(const struct test* t) {
        pakfire_package_set_description(pkg1, "DESCRIPTION");
 
        // Create packager
-       ASSERT_SUCCESS(pakfire_packager_create(&packager, pkg1));
+       ASSERT_SUCCESS(pakfire_packager_create(&packager, t->pakfire, pkg1));
 
        // Write archive
        FILE* f = test_mktemp(&path);