If using --log or -j > 1, disable stdin.
Parallelism and redo-log cause lots of confusion for any rules that try to ask the user for questions, so disable it altogether. Arguably, we should just disable stdin all the time, but maybe it's still occasionally useful (even though you have to pass --no-log to get it back).
This commit is contained in:
parent
70f1557413
commit
1966a0fac7
4 changed files with 17 additions and 4 deletions
6
redo.py
6
redo.py
|
|
@ -79,7 +79,10 @@ import vars, state, builder, jwack
|
|||
from logs import warn, err
|
||||
|
||||
try:
|
||||
if vars_init.is_toplevel:
|
||||
j = atoi(opt.jobs or 1)
|
||||
if vars_init.is_toplevel and (vars.LOG or j > 1):
|
||||
builder.close_stdin()
|
||||
if vars_init.is_toplevel and vars.LOG:
|
||||
builder.start_stdin_log_reader(status=opt.status, details=opt.details,
|
||||
pretty=opt.pretty, color=opt.color,
|
||||
debug_locks=opt.debug_locks, debug_pids=opt.debug_pids)
|
||||
|
|
@ -91,7 +94,6 @@ try:
|
|||
% f.nicename())
|
||||
state.rollback()
|
||||
|
||||
j = atoi(opt.jobs or 1)
|
||||
if j < 1 or j > 1000:
|
||||
err('invalid --jobs value: %r\n' % opt.jobs)
|
||||
jwack.setup(j)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue