From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Jan 2025 16:34:40 +0000 (+0000)
Subject: CLI: Remove option to pass the build ID
X-Git-Tag: 0.9.30~520
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a81deb4b0a064634d2e1199950588af03508713;p=pakfire.git

CLI: Remove option to pass the build ID

I don't think we need this and currently it is a no-op.

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

diff --git a/src/cli/lib/build.c b/src/cli/lib/build.c
index 6995dbabc..06e18f143 100644
--- a/src/cli/lib/build.c
+++ b/src/cli/lib/build.c
@@ -35,7 +35,6 @@
 
 struct cli_local_args {
 	const char* distro;
-	const char* id;
 	const char* target;
 	enum {
 		BUILD_INTERACTIVE     = (1 << 0),
@@ -53,16 +52,14 @@ enum {
 	OPT_DISABLE_CCACHE   = 1,
 	OPT_DISABLE_SNAPSHOT = 2,
 	OPT_DISABLE_TESTS    = 3,
-	OPT_ID               = 4,
-	OPT_NON_INTERACTIVE  = 5,
-	OPT_TARGET           = 6,
+	OPT_NON_INTERACTIVE  = 4,
+	OPT_TARGET           = 5,
 };
 
 static struct argp_option options[] = {
 	{ "disable-ccache",   OPT_DISABLE_CCACHE,      NULL, 0, "Disable the ccache",     0 },
 	{ "disable-snapshot", OPT_DISABLE_SNAPSHOT,    NULL, 0, "Do not use the snapshot", 0 },
 	{ "disable-tests",    OPT_DISABLE_TESTS,       NULL, 0, "Do not run tests",        0 },
-	{ "id",               OPT_ID,                  "ID", 0, "Use this build ID",       1 },
 	{ "non-interactive",  OPT_NON_INTERACTIVE,     NULL, 0, "Run the build non-interactively", 0 },
 	{ "target",           OPT_TARGET,          "TARGET", 0, "Output all packages into this directory", 0 },
 	{ NULL },
@@ -84,10 +81,6 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) {
 			args->flags &= ~BUILD_ENABLE_TESTS;
 			break;
 
-		case OPT_ID:
-			args->id = arg;
-			break;
-
 		case OPT_NON_INTERACTIVE:
 			args->flags &= ~BUILD_INTERACTIVE;
 			break;
@@ -149,8 +142,6 @@ static void log_callback(void* data, int priority, const char* file, int line,
 int cli_build(void* data, int argc, char* argv[]) {
 	struct cli_global_args* global_args = data;
 	struct cli_local_args local_args = {
-		.id     = NULL,
-		.target = NULL,
 		.flags  =
 			BUILD_INTERACTIVE |
 			BUILD_ENABLE_CCACHE |
@@ -175,7 +166,7 @@ int cli_build(void* data, int argc, char* argv[]) {
 
 	// Is the build interactive?
 	if (local_args.flags & BUILD_INTERACTIVE)
-		flags |= 	PAKFIRE_BUILD_INTERACTIVE;
+		flags |= PAKFIRE_BUILD_INTERACTIVE;
 
 	// Enable ccache?
 	if (!(local_args.flags & BUILD_ENABLE_CCACHE))