style: If IGNORE_STYLE=True is set on the scons command line, ignore style.
Use this in the regress script to avoid issues with the checker. --HG-- extra : convert_revision : 562b6a6d73dc46e412d00ba2588af2793335274e
This commit is contained in:
parent
cae8d20633
commit
b92594dd90
2 changed files with 2 additions and 2 deletions
|
@ -118,7 +118,7 @@ pretxncommit.style = python:style.check_whitespace
|
|||
""" % (ROOT)
|
||||
sys.exit(1)
|
||||
|
||||
if isdir(joinpath(ROOT, '.hg')):
|
||||
if ARGUMENTS['IGNORE_STYLE'] != 'True' and isdir(joinpath(ROOT, '.hg')):
|
||||
try:
|
||||
from mercurial import ui
|
||||
check_style_hook(ui.ui())
|
||||
|
|
|
@ -99,7 +99,7 @@ try:
|
|||
if options.jobs != 1:
|
||||
scons_opts += ' -j %d' % options.jobs
|
||||
|
||||
system('scons %s %s' % (scons_opts, ' '.join(targets)))
|
||||
system('scons IGNORE_STYLE=True %s %s' % (scons_opts, ' '.join(targets)))
|
||||
|
||||
sys.exit(0)
|
||||
|
||||
|
|
Loading…
Reference in a new issue