From 5ad021468a2ca45440c7f4a4eb161cffda2d479b Mon Sep 17 00:00:00 2001 From: Jana Cupova Date: Jun 07 2022 11:46:36 +0000 Subject: CLI: Remove --paths option from list-buildroot Fixes: https://pagure.io/koji/issue/3106 --- diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py index 42213c3..98c73b4 100644 --- a/cli/koji_cli/commands.py +++ b/cli/koji_cli/commands.py @@ -2785,15 +2785,12 @@ def anon_handle_list_buildroot(goptions, session, args): "[info] List the rpms used in or built in a buildroot" usage = "usage: %prog list-buildroot [options] " parser = OptionParser(usage=get_usage_str(usage)) - parser.add_option("--paths", action="store_true", help=SUPPRESS_HELP) parser.add_option("--built", action="store_true", help="Show the built rpms") parser.add_option("--verbose", "-v", action="store_true", help="Show more information") (options, args) = parser.parse_args(args) if len(args) != 1: parser.error("Incorrect number of arguments") ensure_connection(session, goptions) - if options.paths: - parser.error("--paths option is deprecated and will be removed in 1.30") buildrootID = int(args[0]) opts = {} if options.built: diff --git a/tests/test_cli/test_list_buildroot.py b/tests/test_cli/test_list_buildroot.py index 7519926..54c8a98 100644 --- a/tests/test_cli/test_list_buildroot.py +++ b/tests/test_cli/test_list_buildroot.py @@ -22,17 +22,6 @@ class TestListBuilds(utils.CliTestCase): %s: error: {message} """ % (self.progname, self.progname) - def test_list_buildroot_with_paths_option(self): - expected = "--paths option is deprecated and will be removed in 1.30" - self.assert_system_exit( - anon_handle_list_buildroot, - self.options, self.session, ['--paths', '1'], - stderr=self.format_error_message(expected), - exit_code=2, - activate_session=None) - self.ensure_connection_mock.assert_called_once_with(self.session, self.options) - self.session.listRPMs.assert_not_called() - def test_list_buildroot_without_args(self): self.assert_system_exit( anon_handle_list_buildroot,