From: Tomas Mlcoch <tmlcoch@redhat.com>
Date: Mon, 15 Apr 2013 06:42:45 +0000 (+0200)
Subject: mergerepo_c: Implicitly use --all with --koji.
X-Git-Tag: upstream/0.2.1~229
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d416fd4dbd3691d27f49ddc2ddab7e89bc8a7197;p=services%2Fcreaterepo_c.git

mergerepo_c: Implicitly use --all with --koji.
---

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");