packages: Fix my messy code and use proper return codes

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

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index 10b3422cc975cdb5b30487ad9bf93565a6f4b4b0..bbd2cee172909e1bac3b9e9d4ee1074a60d9a198 100644 (file)
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -298,11 +298,9 @@ static int pakfire_build_process_deps(struct pakfire* pakfire,
                case LOG_INFO:
                        // Filter out any dependencies that are provided by this package
                        if (ctx->dep == PAKFIRE_PKG_REQUIRES) {
-                               r = pakfire_package_matches_dep(ctx->pkg, PAKFIRE_PKG_PROVIDES, buffer);
-                               if (r > 0) {
+                               if (pakfire_package_matches_dep(ctx->pkg, PAKFIRE_PKG_PROVIDES, buffer)) {
                                        ERROR(pakfire,
-                                               "Skipping dependency that is provided by the package itself: %s\n",
-                                               buffer);
+                                               "Skipping dependency that is provided by the package itself: %s\n", buffer);
                                        return 0;
                                }
                        }

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index 5a0307dff371c874d60490a1d10ce387ef438e08..ea4ccc265cbc082a19ebf44f976477a8a65bc4e8 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -1120,7 +1120,7 @@ int pakfire_package_matches_dep(struct pakfire_package* pkg,
        Solvable* s = get_solvable(pkg);
 
        // Check whether this solvable matches the requested dependency
-       return solvable_matchesdep(s, id, depid, marker) == 0;
+       return solvable_matchesdep(s, id, depid, marker);
 }
 
 PAKFIRE_EXPORT struct pakfire_repo* pakfire_package_get_repo(struct pakfire_package* pkg) {

diff --git a/tests/libpakfire/dependencies.c b/tests/libpakfire/dependencies.c
index d46f27c2d6ab3a326aa62d3b9fa8b9f4caf024e4..750224bf723658ccecca770d86b5b65032bb2a53 100644 (file)
--- a/tests/libpakfire/dependencies.c
+++ b/tests/libpakfire/dependencies.c
@@ -177,25 +177,25 @@ static int test_dep_match(const struct test* t) {
                "test", "1.0-1", "x86_64"));
 
        // Check if the package matches itself
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "test") == 1);
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "test = 1.0-1") == 1);
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "test"));
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "test = 1.0-1"));
 
        // Add a couple of things this package provides
        ASSERT_SUCCESS(pakfire_package_add_dep(pkg, PAKFIRE_PKG_PROVIDES, "a = 1"));
        ASSERT_SUCCESS(pakfire_package_add_dep(pkg, PAKFIRE_PKG_PROVIDES, "b"));
 
        // Check if the package matches those dependencies
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a") == 1);
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a = 1") == 1);
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a >= 1") == 1);
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a <= 1") == 1);
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a"));
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a = 1"));
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a >= 1"));
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "a <= 1"));
 
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "b") == 1);
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "b = 1") == 1);
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "b"));
+       ASSERT_TRUE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "b = 1"));
 
        // Check for something that doesn't exist
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "c") == 0);
-       ASSERT_SUCCESS(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "c = 2") == 0);
+       ASSERT_FALSE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "c"));
+       ASSERT_FALSE(pakfire_package_matches_dep(pkg, PAKFIRE_PKG_PROVIDES, "c = 2"));
 
        // Everything passed
        r = EXIT_SUCCESS;