From 48780d25bc5c0510e128b28971897649660937b8 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Jul 01 2021 10:51:25 +0000 Subject: Revert a temporary fix for mock >= 1.4.1 of 2017 This commit partially revert this commit commit 4cd71d9b126efad5acab9ef06ccbd34ea39680d3 Author: Björn Esser Date: Fri Jun 2 21:33:58 2017 +0000 Add mock-option '--no-bootstrap-chroot' to defaults This is a temporary fix for mock >= 1.4.1 --- diff --git a/fedora-review.1 b/fedora-review.1 index 6f6aa1a..99466fb 100644 --- a/fedora-review.1 +++ b/fedora-review.1 @@ -123,8 +123,7 @@ with the .cfg suffix stripped. Defaults to the root defined in .TP 4 .B -o, --mock-options "options..." Mock options for the build. Defaults to --no-cleanup-after --no-clean, -for use with mock >= 1.4.1 --no-bootstrap-chroot additionally, you might -want this along with other options you provide. +you might want this along with other options you provide. .TP 4 .B --no-report Do not generate the review template. diff --git a/src/FedoraReview/settings.py b/src/FedoraReview/settings.py index 8655a2b..05b0f72 100644 --- a/src/FedoraReview/settings.py +++ b/src/FedoraReview/settings.py @@ -74,8 +74,6 @@ def _check_mock_ver(): def _mock_options_default(): """ Returns the default mock options """ mock_opts = "--no-cleanup-after --no-clean" - if version.parse(_check_mock_ver()) >= version.parse("1.4.1"): - mock_opts = "--no-bootstrap-chroot %s" % mock_opts return mock_opts