From d416fd4dbd3691d27f49ddc2ddab7e89bc8a7197 Mon Sep 17 00:00:00 2001 From: Tomas Mlcoch Date: Mon, 15 Apr 2013 08:42:45 +0200 Subject: [PATCH] mergerepo_c: Implicitly use --all with --koji. --- src/mergerepo_c.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c index 8ca5fda..1655e4a 100644 --- a/src/mergerepo_c.c +++ b/src/mergerepo_c.c @@ -334,7 +334,9 @@ check_arguments(struct CmdOptions *options) // Merge method if (options->merge_method_str) { - if (!g_strcmp0(options->merge_method_str, "repo")) { + if (options->koji) { + g_message("With -k/--koji argument merge method is ignored (--all is implicitly used)."); + } else if (!g_strcmp0(options->merge_method_str, "repo")) { options->merge_method = MM_REPO; } else if (!g_strcmp0(options->merge_method_str, "ts")) { options->merge_method = MM_TIMESTAMP; @@ -352,6 +354,9 @@ check_arguments(struct CmdOptions *options) } // Koji arguments + if (options->koji) + options->all = TRUE; + if (options->blocked) { if (!options->koji) { g_critical("-b/--blocked cannot be used without -k/--koji argument"); -- 2.7.4