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

22
redo/cmd_ifchange.py
View file

@ -1,16 +1,16 @@
import os, sys, traceback
import vars_init
vars_init.init(sys.argv[1:])
import env_init
env_init.init(sys.argv[1:])
import vars, state, builder, jobserver, deps
import env, state, builder, jobserver, deps
from logs import debug2, err
def should_build(t):
f = state.File(name=t)
if f.is_failed():
raise builder.ImmediateReturn(32)
dirty = deps.isdirty(f, depth='', max_changed=vars.RUNID,
dirty = deps.isdirty(f, depth='', max_changed=env.RUNID,
already_checked=[])
return f.is_generated, dirty == [f] and deps.DIRTY or dirty
@ -18,17 +18,17 @@ def should_build(t):
def main():
rv = 202
try:
if vars_init.is_toplevel and vars.LOG:
if env_init.is_toplevel and env.LOG:
builder.close_stdin()
builder.start_stdin_log_reader(
status=True, details=True,
pretty=True, color=True, debug_locks=False, debug_pids=False)
if vars.TARGET and not vars.UNLOCKED:
me = os.path.join(vars.STARTDIR,
os.path.join(vars.PWD, vars.TARGET))
if env.TARGET and not env.UNLOCKED:
me = os.path.join(env.STARTDIR,
os.path.join(env.PWD, env.TARGET))
f = state.File(name=me)
debug2('TARGET: %r %r %r\n'
% (vars.STARTDIR, vars.PWD, vars.TARGET))
% (env.STARTDIR, env.PWD, env.TARGET))
else:
f = me = None
debug2('redo-ifchange: not adding depends.\n')
@ -52,11 +52,11 @@ def main():
err('unexpected error: %r\n' % e)
rv = 1
except KeyboardInterrupt:
if vars_init.is_toplevel:
if env_init.is_toplevel:
builder.await_log_reader()
sys.exit(200)
state.commit()
if vars_init.is_toplevel:
if env_init.is_toplevel:
builder.await_log_reader()
sys.exit(rv)