From c9d204d87ca38ba4a5a7ad3668fa7bf4e857d5f7 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Jan 04 2024 13:14:23 +0000
Subject: add option to mockbuild use default resultdir of mock (v3)


Signed-off-by: Sérgio M. Basto <sergio@serjux.com>

---

diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
index d2d8c8a..4c56169 100644
--- a/pyrpkg/__init__.py
+++ b/pyrpkg/__init__.py
@@ -3127,7 +3127,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
@@ -3167,7 +3167,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 b6adaad..ad13932 100644
--- a/pyrpkg/cli.py
+++ b/pyrpkg/cli.py
@@ -1155,6 +1155,10 @@ class cliClient(object):
             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.add_argument(
             '--extra-pkgs', action='append', nargs='*',
             help="Install additional packages into chroot")
 
@@ -2544,7 +2548,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)