parallel_emerge - Issue 3061029: Disable collision-protect in parallel_emerge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: parallel_emerge

Issue 3061029: Disable collision-protect in parallel_emerge. (Closed) Base URL: ssh://git@chromiumos-git/crosutils.git

Patch Set: Created 10 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: parallel_emerge

diff --git a/parallel_emerge b/parallel_emerge

index 12548fa878444c88c91de6667fd710dce7622f00..58c2e963da537c34a5469b020969490c654e3324 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",

« no previous file with comments | « no previous file | no next file » | no next file with comments »