From 0900de628a3a7fa1039bd534831350e73f746501 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Feb 19 2020 04:40:52 +0000 Subject: rpmbuild: mock config s/use_bootstrap_container/use_bootstrap/ This is to avoid the warning: WARNING: config_opts['use_bootstrap_container'] is deprecated, please use config_opts['use_bootstrap'] instead --- diff --git a/rpmbuild/mock.cfg.j2 b/rpmbuild/mock.cfg.j2 index f726830..1300e59 100644 --- a/rpmbuild/mock.cfg.j2 +++ b/rpmbuild/mock.cfg.j2 @@ -16,7 +16,7 @@ config_opts['use_host_resolv'] = False config_opts['macros']['%copr_username'] = '{{ copr_username }}' config_opts['macros']['%copr_projectname'] = '{{ copr_projectname }}' -config_opts['use_bootstrap_container'] = {{ 'True' if use_bootstrap_container else 'False' }} +config_opts['use_bootstrap'] = {{ 'True' if use_bootstrap_container else 'False' }} {% if use_bootstrap_container %} config_opts['bootstrap_chroot_additional_packages'] = [] diff --git a/rpmbuild/tests/test_mock.py b/rpmbuild/tests/test_mock.py index 48b28fe..67cf677 100644 --- a/rpmbuild/tests/test_mock.py +++ b/rpmbuild/tests/test_mock.py @@ -124,7 +124,7 @@ class TestMockBuilder(object): assert config_opts["root"] == "10-fedora-24-x86_64" assert config_opts["chroot_additional_packages"] == "pkg1 pkg2 pkg3" assert config_opts["rpmbuild_networking"] - assert not config_opts["use_bootstrap_container"] + assert not config_opts["use_bootstrap"] assert config_opts["macros"]["%copr_username"] == "@copr" assert config_opts["macros"]["%copr_projectname"] == "copr-dev" assert config_opts["yum.conf"] == [] @@ -153,7 +153,7 @@ config_opts['use_host_resolv'] = True config_opts['macros']['%copr_username'] = '@copr' config_opts['macros']['%copr_projectname'] = 'copr-dev' -config_opts['use_bootstrap_container'] = False +config_opts['use_bootstrap'] = False @@ -223,7 +223,7 @@ config_opts['use_bootstrap_container'] = False assert call[0][0] == self.mock_rpm_call part_of_expected_output = ( - "config_opts['use_bootstrap_container'] = False\n" + "config_opts['use_bootstrap'] = False\n" "\n" "\n" "\n"