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

Oops, broken 'install.do' target after pylint fixes.

Browse source
This commit is contained in:
Avery Pennarun 2018-12-03 21:15:31 -05:00
commit 02f307578b
2 changed files with 43 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
install.do
View file

@ -42,6 +42,7 @@ for dd in redo*.py; do
exedir = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) exedir = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
sys.path.insert(0, os.path.join(exedir, '../lib/redo')) sys.path.insert(0, os.path.join(exedir, '../lib/redo'))
import $fix import $fix
$fix.main()
EOF EOF
$INSTALL -m 0755 install.wrapper $BINDIR/$d $INSTALL -m 0755 install.wrapper $BINDIR/$d
done done

9
redo.py
View file

@ -78,7 +78,8 @@ vars_init.init(targets)
import vars, state, builder, jwack import vars, state, builder, jwack
from logs import warn, err from logs import warn, err
try: def main():
try:
j = atoi(opt.jobs or 1) j = atoi(opt.jobs or 1)
if vars_init.is_toplevel and (vars.LOG or j > 1): if vars_init.is_toplevel and (vars.LOG or j > 1):
builder.close_stdin() builder.close_stdin()
@ -115,7 +116,11 @@ try:
if vars_init.is_toplevel: if vars_init.is_toplevel:
builder.await_log_reader() builder.await_log_reader()
sys.exit(retcode) sys.exit(retcode)
except KeyboardInterrupt: except KeyboardInterrupt:
if vars_init.is_toplevel: if vars_init.is_toplevel:
builder.await_log_reader() builder.await_log_reader()
sys.exit(200) sys.exit(200)
if __name__ == '__main__':
main()