[copr/copr] 01/02: rpmbuild: adding scrub bootstrap and scrub chroot

This is an automated email from the git hooks/post-receive script. praiskup pushed a commit to branch master in repository copr/copr. commit 2660ee58697202043da41aaee2df07c335e95bd3 Author: Silvie Chlupova <sisi.chlupova(a)gmail.com&gt; AuthorDate: Wed Mar 18 17:49:16 2020 +0100 rpmbuild: adding scrub bootstrap and scrub chroot Fixes: #1299 --- rpmbuild/copr_rpmbuild/builders/mock.py | 9 ++++++--- rpmbuild/tests/test_mock.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rpmbuild/copr_rpmbuild/builders/mock.py b/rpmbuild/copr_rpmbuild/builders/mock.py index d898038..413399b 100644 --- a/rpmbuild/copr_rpmbuild/builders/mock.py +++ b/rpmbuild/copr_rpmbuild/builders/mock.py @@ -42,7 +42,7 @@ class MockBuilder(object): srpm = locate_srpm(self.resultdir) self.produce_rpm(srpm, self.resultdir) finally: - self.clean_cache() + self.mock_clean() self.archive_configs() def prepare_configs(self): @@ -96,11 +96,14 @@ class MockBuilder(object): if process.returncode != 0: raise RuntimeError("Mock build failed") - def clean_cache(self): + def mock_clean(self): """ Do best effort /var/mock/cache cleanup. """ cmd = MOCK_CALL + [ "-r", self.mock_config_file, - "--scrub", "cache", "--quiet", + "--scrub", "cache", + "--scrub", "bootstrap", + "--scrub", "chroot", + "--quiet", ] subprocess.call(cmd) # ignore failure here, if any diff --git a/rpmbuild/tests/test_mock.py b/rpmbuild/tests/test_mock.py index 67cf677..44001c9 100644 --- a/rpmbuild/tests/test_mock.py +++ b/rpmbuild/tests/test_mock.py @@ -22,7 +22,7 @@ def f_mock_calls(): p_popen = mock.patch('copr_rpmbuild.builders.mock.GentlyTimeoutedPopen') dummy_patchers = [ - mock.patch('copr_rpmbuild.builders.mock.MockBuilder.clean_cache'), + mock.patch('copr_rpmbuild.builders.mock.MockBuilder.mock_clean'), mock.patch('copr_rpmbuild.builders.mock.shutil'), mock.patch('copr_rpmbuild.builders.mock.locate_spec', new=mock.MagicMock(return_value='spec')), -- To stop receiving notification emails like this one, please contact the administrator of this repository.