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

Fix log() output so you can cut-and-paste it verbatim into a command line.

Browse source 
It used to say:
	redo:   t/all
	redo:     hello
and now it says:
	redo    t/all
	redo      t/hello

ie. there's no colon, and the path is intact.  That means if the build
fails, you can cut-and-paste 'redo   t/hello', add a -v, and try to debug
what went wrong.
This commit is contained in:
Avery Pennarun 2010-11-13 01:55:07 -08:00
commit 9c349cf652
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
helpers.py
View file

@ -48,10 +48,10 @@ def _log(s):
def _clog(s): def _clog(s):
if vars.VERBOSE: _log('\n') if vars.VERBOSE: _log('\n')
_log('\x1b[32mredo: %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s)) _log('\x1b[32mredo %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s))
def _bwlog(s): def _bwlog(s):
if vars.VERBOSE: _log('\n') if vars.VERBOSE: _log('\n')
_log('redo: %s%s' % (vars.DEPTH, s)) _log('redo %s%s' % (vars.DEPTH, s))
def _cerr(s): def _cerr(s):
_log('\x1b[31mredo: %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s)) _log('\x1b[31mredo: %s\x1b[1m%s\x1b[m' % (vars.DEPTH, s))

4
redo.py
View file

@ -28,6 +28,7 @@ if not os.environ.get('REDO_BASE', ''):
base = newbase base = newbase
break break
os.environ['REDO_BASE'] = base os.environ['REDO_BASE'] = base
os.environ['REDO_STARTDIR'] = os.getcwd()
import vars import vars
from helpers import * from helpers import *
@ -90,11 +91,10 @@ def build(t):
os.path.basename(t), 'FIXME', os.path.basename(tmpname)] os.path.basename(t), 'FIXME', os.path.basename(tmpname)]
if vars.VERBOSE: if vars.VERBOSE:
argv[1] += 'v' argv[1] += 'v'
log('%s\n' % t) log('%s\n' % relpath(t, vars.STARTDIR))
rv = subprocess.call(argv, preexec_fn=lambda: _preexec(t), rv = subprocess.call(argv, preexec_fn=lambda: _preexec(t),
stdout=f.fileno()) stdout=f.fileno())
st = os.stat(tmpname) st = os.stat(tmpname)
#log('rv: %d (%d bytes) (%r)\n' % (rv, st.st_size, dofile))
stampfile = sname('stamp', t) stampfile = sname('stamp', t)
if rv==0: if rv==0:
if st.st_size: if st.st_size:

1
vars.py
View file

@ -4,6 +4,7 @@ TARGET = os.environ.get('REDO_TARGET', '')
DEPTH = os.environ.get('REDO_DEPTH', '') DEPTH = os.environ.get('REDO_DEPTH', '')
DEBUG = os.environ.get('REDO_DEBUG', '') and 1 or 0 DEBUG = os.environ.get('REDO_DEBUG', '') and 1 or 0
VERBOSE = os.environ.get('REDO_VERBOSE', '') and 1 or 0 VERBOSE = os.environ.get('REDO_VERBOSE', '') and 1 or 0
STARTDIR = os.environ.get('REDO_STARTDIR', '')
BASE = os.environ.get('REDO_BASE', '') BASE = os.environ.get('REDO_BASE', '')
if BASE: if BASE:
BASE = os.path.abspath(BASE) BASE = os.path.abspath(BASE)