PR#637: add option to mockbuild use default resultdir of mock (v3) - rpkg

rpkg

#637 add option to mockbuild use default resultdir of mock (v3)

Merged a year ago by onosek. Opened 2 years ago by sergiomb.

sergiomb/rpkg master into master

add option to mockbuild use default resultdir of mock (v3)

Sérgio M. Basto • a year ago

c9d204d

pyrpkg/__init__.py

file modified

+4 -2

		`@@ -3127,7 +3127,7 @@`
		`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 @@`
		`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')`

pyrpkg/cli.py

file modified

+5 -1

		`@@ -1155,6 +1155,10 @@`
		`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 @@`
		`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)`

sergiomb commented 2 years ago

This is a refresh of PR https://pagure.io/rpkg/pull-request/609
after understand that mockbuild was already in fist commit that set resultdir https://pagure.io/rpkg/c/7dc8589c
This new approx change the option name to default-mock-resultdir.
and just change it in mockbuild function and make the logic simpler.

sergiomb commented 2 years ago

I forgot to mention from 4 places that is called self.cmd.mockbuild on pyrpkg/cli.py, only in one place is called with default_mock_resultdir=self.args.default_mock_resultdir

rebased onto da5d7c10197d700ae3132e6eadb46b17126d877b

2 years ago

rebased onto 6cab3155c6f5927b9531e70224dea35b0935d643

2 years ago

sergiomb commented 2 years ago

mockbuild with --default-mock-resultdir will write all results in /var/lib/mock/fedora-37-x86_64/result/ on Fedora 37 x86_64

please merge this doesn't change any behavior (from 4 places that is called self.cmd.mockbuild on pyrpkg/cli.py, only in one place is called with default_mock_resultdir=self.args.default_mock_resultdir )

rebased onto 71d001aed568259db0e5c4f42f818f6ae8919e6c

2 years ago

rebased onto 785f1b04893151fcf9cff41b803a2d7d77f05226

2 years ago

rebased onto c9d204d

a year ago

pretty please pagure-ci rebuild

a year ago