PR#437: Pass --enable-network to mock - rpkg

Ondrej Nosek • 5 years ago

1774559

pyrpkg/cli.py

file modified

		`@@ -1090,6 +1090,8 @@`
		`mockbuild_parser.add_argument(`
		`'--disablerepo', action='append',`
		`help='Pass disablerepo option to yum/dnf (may be used more than once)')`
		`+ mockbuild_parser.add_argument(`
		`+ '--enable-network', action='store_true', help='Enable networking')`
		`mockbuild_parser.set_defaults(command=self.mockbuild)`

		`def register_mock_config(self):`
		`@@ -2082,6 +2084,9 @@`
		`for repo_value in self.args.disablerepo:`
		`mockargs.extend(['--disablerepo', repo_value])`

		`+ if self.args.enable_network:`
		`+ mockargs.append('--enable-network')`
		`+`
		`# Pick up any mockargs from the env`
		`try:`
		`mockargs += os.environ['MOCKARGS'].split()`

tests/test_cli.py

file modified

+3 -1

		`@@ -1454,12 +1454,14 @@`
		`'--release', 'rhel-6', 'mockbuild',`
		`'--root', '/etc/mock/some-root',`
		`'--enablerepo', 'FAVOURITE_REPO', '--disablerepo', 'UNWANTED_REPO',`
		`- '--enablerepo', 'ANOTHER_FAVOURITE_REPO']`
		`+ '--enablerepo', 'ANOTHER_FAVOURITE_REPO',`
		`+ '--enable-network']`
		`cli = self.mockbuild(cli_cmd)`

		`expected_cmd = ['mock', '--enablerepo', 'FAVOURITE_REPO',`
		`'--enablerepo', 'ANOTHER_FAVOURITE_REPO',`
		`'--disablerepo', 'UNWANTED_REPO',`
		`+ '--enable-network',`
		`'-r', '/etc/mock/some-root',`
		`'--resultdir', cli.cmd.mock_results_dir, '--rebuild',`
		`cli.cmd.srpmname]`