mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 15:11:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disable collision-protect in parallel_emerge.

Browse Source 
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
This commit is contained in:
David James 2010-07-29 01:01:15 -07:00
parent 0366864a98
commit de456309c8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parallel_emerge
View File

@ -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",