From: Michael Tremer Date: Sun, 5 Jan 2025 15:44:19 +0000 (+0000) Subject: build: Fix conflicting flag name X-Git-Tag: 0.9.30~526 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b703d303493a7da2cfe2c9ae976915e80f235507;p=pakfire.git build: Fix conflicting flag name Signed-off-by: Michael Tremer --- diff --git a/src/cli/lib/client-build.c b/src/cli/lib/client-build.c index beb92c32e..e6e982172 100644 --- a/src/cli/lib/client-build.c +++ b/src/cli/lib/client-build.c @@ -76,7 +76,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { break; case OPT_DISABLE_TESTS: - args->flags |= PAKFIRE_BUILD_DISABLE_TESTS; + args->flags |= PAKFIRE_BUILDSERVICE_DISABLE_TESTS; break; case OPT_REPO: diff --git a/src/pakfire/buildservice.c b/src/pakfire/buildservice.c index 05b71b48d..73fc61a40 100644 --- a/src/pakfire/buildservice.c +++ b/src/pakfire/buildservice.c @@ -250,7 +250,7 @@ int pakfire_buildservice_build(struct pakfire_buildservice* service, const char* } // Disable tests? - if (flags & PAKFIRE_BUILD_DISABLE_TESTS) { + if (flags & PAKFIRE_BUILDSERVICE_DISABLE_TESTS) { r = pakfire_xfer_add_param(xfer, "disable_test_builds", "%s", "yes"); if (r) goto ERROR; diff --git a/src/pakfire/buildservice.h b/src/pakfire/buildservice.h index 3508458a1..9b71863d7 100644 --- a/src/pakfire/buildservice.h +++ b/src/pakfire/buildservice.h @@ -38,7 +38,7 @@ const char* pakfire_buildservice_get_url(struct pakfire_buildservice* service); // Builds typedef enum pakfire_buildservice_build_flags { - PAKFIRE_BUILD_DISABLE_TESTS = (1 << 0), + PAKFIRE_BUILDSERVICE_DISABLE_TESTS = (1 << 0), } pakfire_buildservice_build_flags_t; int pakfire_buildservice_build(struct pakfire_buildservice* service, const char* upload,