forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename vars{,_init}.py -> env{,_init}.py.

Browse source 
This fixes some pylint 'redefined builtins' warnings.  While I was
here, I fixed the others too by renaming a few local variables.
This commit is contained in:
Avery Pennarun 2018-12-04 23:34:28 -05:00
commit ded14507b0
19 changed files with 142 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

18
redo/cmd_redo.py
View file

@ -71,18 +71,18 @@ if opt.no_log:
if opt.no_color:
os.environ['REDO_COLOR'] = '0'
import vars_init
vars_init.init(targets)
import env_init
env_init.init(targets)
import vars, state, builder, jobserver
import env, state, builder, jobserver
from logs import warn, err
def main():
try:
j = atoi(opt.jobs or 1)
if vars_init.is_toplevel and (vars.LOG or j > 1):
if env_init.is_toplevel and (env.LOG or j > 1):
builder.close_stdin()
if vars_init.is_toplevel and vars.LOG:
if env_init.is_toplevel and env.LOG:
builder.start_stdin_log_reader(
status=opt.status, details=opt.details,
pretty=opt.pretty, color=opt.color,
@ -91,8 +91,8 @@ def main():
if os.path.exists(t):
f = state.File(name=t)
if not f.is_generated:
warn('%s: exists and not marked as generated; not redoing.\n'
% f.nicename())
warn(('%s: exists and not marked as generated; ' +
'not redoing.\n') % f.nicename())
state.rollback()
if j < 1 or j > 1000:
@ -112,11 +112,11 @@ def main():
traceback.print_exc(100, sys.stderr)
err('unexpected error: %r\n' % e)
retcode = 1
if vars_init.is_toplevel:
if env_init.is_toplevel:
builder.await_log_reader()
sys.exit(retcode)
except KeyboardInterrupt:
if vars_init.is_toplevel:
if env_init.is_toplevel:
builder.await_log_reader()
sys.exit(200)