From 25b70fe5b5e9d5166f9731e69f77e348a0a0c4e3 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 05 2019 23:59:34 +0000 Subject: [PATCH 1/2] honor mock.package_manager tag setting in mock-config cli Fixes: https://pagure.io/koji/issue/1167 --- diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py index 8efe4de..900b8eb 100644 --- a/cli/koji_cli/commands.py +++ b/cli/koji_cli/commands.py @@ -987,6 +987,14 @@ def anon_handle_mock_config(goptions, session, args): name = options.name else: name = "%(tag_name)s-repo_%(repoid)s" % opts + + event = None + if opts['repoid'] != 'latest': + event = session.repoInfo(opts['repoid'])['create_event'] + buildcfg = session.getBuildConfig(opts['tag_name'], event=event) + if 'mock.package_manager' in buildcfg['extra']: + opts['package_manager'] = buildcfg['extra']['mock.package_manager'] + output = koji.genMockConfig(name, arch, **opts) if options.ofile: fo = open(options.ofile, 'w') From 2092cf3a214bb20afd7d646fde960b7bc9dbf419 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Apr 05 2019 23:59:34 +0000 Subject: [PATCH 2/2] fix unit test --- diff --git a/tests/test_cli/test_mock_config.py b/tests/test_cli/test_mock_config.py index 78fe928..23e48b1 100644 --- a/tests/test_cli/test_mock_config.py +++ b/tests/test_cli/test_mock_config.py @@ -210,7 +210,7 @@ config_opts['macros']['%distribution'] = 'Koji Testing' self.assert_console_message(stdout, expected) # return build config - session.getBuildConfig.return_value = {'id': 301} + session.getBuildConfig.return_value = {'id': 301, 'extra': {}} expected = "Could not get a repo for tag: %(name)s\n" % tag self.assertEqual(1, anon_handle_mock_config(options, session, arguments)) self.assert_console_message(stdout, expected)