From de456309c808aab85becc18ca0acec550a5d3fd6 Mon Sep 17 00:00:00 2001 From: David James Date: Thu, 29 Jul 2010 01:01:15 -0700 Subject: [PATCH] Disable collision-protect in parallel_emerge. collision-protect doesn't make sense for parallel_emerge, because we don't lock around merges. Also, if merge fails part-way through, it's strange to fail just because some files are lying around. This fixes an issue with the buildbots. TEST=Checked that collision-protect feature gets deleted by this. BUG=none Review URL: http://codereview.chromium.org/3061029 --- parallel_emerge | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parallel_emerge b/parallel_emerge index 12548fa878..58c2e963da 100755 --- a/parallel_emerge +++ b/parallel_emerge @@ -356,6 +356,9 @@ class DepGraphGenerator(object): if (settings.get("PORTAGE_DEBUG", "") == "1" and "python-trace" in settings.features): portage.debug.set_trace(True) + # Since we don't have locking around merges, the collision-protect + # feature doesn't make sense. + settings.features.discard("collision-protect") # Complain about unsupported options for opt in ("--ask", "--ask-enter-invalid", "--complete-graph",