From 35ec8c4a2d75cbc49214ab97adc4f5a4f8edbbd3 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Oct 07 2022 22:02:55 +0000 Subject: add option to mockbuild use default resultdir of mock (v3) Signed-off-by: Sérgio M. Basto --- diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py index 1595344..ff7077d 100644 --- a/pyrpkg/__init__.py +++ b/pyrpkg/__init__.py @@ -3007,7 +3007,7 @@ class Commands(object): return root, config_dir def mockbuild(self, mockargs=[], root=None, hashtype=None, shell=None, - force_local_mock_config=None, srpm_mock=False): + force_local_mock_config=None, srpm_mock=False, default_mock_resultdir=False): """Build the package in mock, using mockargs Log the output and returns nothing @@ -3047,7 +3047,9 @@ class Commands(object): if config_dir: cmd.extend(['--configdir', config_dir]) - cmd += ['-r', root, '--resultdir', self.mock_results_dir] + cmd += ['-r', root] + if default_mock_resultdir is not True: + cmd += ['--resultdir', self.mock_results_dir] if shell: cmd.append('--shell') diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py index b0a16fb..055281d 100644 --- a/pyrpkg/cli.py +++ b/pyrpkg/cli.py @@ -1142,6 +1142,10 @@ class cliClient(object): '--use-local-mock-config', default=None, dest="local_mock_config", action='store_true', help="Enforce use of local Mock configuration.") + mockbuild_parser.add_argument( + '--default-mock-resultdir', default=None, dest="default_mock_resultdir", + action='store_true', + help="Don't modify Mock resultdir.") mockbuild_parser.set_defaults(command=self.mockbuild) @@ -2422,7 +2426,7 @@ class cliClient(object): self.cmd.mockbuild(mockargs, self.args.root, hashtype=self.args.hash, shell=self.args.shell, # nosec - force_local_mock_config=self.args.local_mock_config) + force_local_mock_config=self.args.local_mock_config, default_mock_resultdir=self.args.default_mock_resultdir) except Exception as e: raise rpkgError(e)