diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rwxr-xr-x | util/regress | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 1569ce182..82a281190 100644 --- a/SConstruct +++ b/SConstruct @@ -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()) diff --git a/util/regress b/util/regress index 4d3eddab8..5723eb171 100755 --- a/util/regress +++ b/util/regress @@ -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) |