Merge pull request #2900 from OSInside/fix_repo_type_setup_from_cmdline

Fix repo type setup when set from cmdline

Author: Conan-Kudo

kiwi/tasks/system_build.py

@@ -371,6 +371,13 @@ def _get_repo_parameters(self, tokens, credentials):
         parameters = self.eleventuple_token(tokens)
         signing_keys_index = 6
         repo_source_index = 0
+        repo_type_index = 1
+        if not parameters[repo_type_index]:
+            # make sure to pass a None value if an empty string
+            # is provided as repo type. This will cause no type
+            # attribute to be set instead of an empty type which
+            # is not allowed by the schema
+            parameters[repo_type_index] = None
         if not parameters[signing_keys_index]:
             # make sure to pass empty list for signing_keys param
             parameters[signing_keys_index] = []

test/unit/tasks/system_build_test.py

@@ -368,7 +368,8 @@ def test_process_system_build_prepare_stage_add_repo(
         self.task.command_args['--add-repo'] = [
             'http://example1.com,yast2,alias,99,false,true',
             'http://example2.com,yast2,alias,99,false,true',
-            'http://example3.com,yast2,alias,99,false,true'
+            'http://example3.com,yast2,alias,99,false,true',
+            'http://example4.com,,alias,99,false,true'
         ]
         self.task.process()
         assert mock_add_repo.call_args_list == [
@@ -383,6 +384,10 @@ def test_process_system_build_prepare_stage_add_repo(
             call(
                 'http://example3.com', 'yast2', 'alias', '99',
                 False, True, [], None, None, None, None
+            ),
+            call(
+                'http://example4.com', None, 'alias', '99',
+                False, True, [], None, None, None, None
             )
         ]
         self.task.command_args['--add-repo-credentials'] = [
@@ -403,6 +408,10 @@ def test_process_system_build_prepare_stage_add_repo(
             call(
                 'http://example3.com', 'yast2', 'alias', '99',
                 False, True, [], None, None, None, None
+            ),
+            call(
+                'http://example4.com', None, 'alias', '99',
+                False, True, [], None, None, None, None
             )
         ]