summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-08-13 23:44:26 -0400
committerAli Saidi <saidi@eecs.umich.edu>2007-08-13 23:44:26 -0400
commit27ddf0b40e9b0bea1d75d825c7339c9fb9411bc9 (patch)
treec6dea0a58fec9d5efecfb5559e3e1eaa24b33878 /SConstruct
parentb069b81acf498a538b1ce4b30ff8b2d96b2ec8de (diff)
parent9b4be6532741a511ca8f9e1d051269245814be8b (diff)
downloadgem5-27ddf0b40e9b0bea1d75d825c7339c9fb9411bc9.tar.xz
Merge IGNORE_STYLE change and my change.
--HG-- extra : convert_revision : 13880ec6df17b0317d4097243bb24add753a098a
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 1569ce182..30c1ed0a6 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.get('IGNORE_STYLE') != 'True' and isdir(joinpath(ROOT, '.hg')):
try:
from mercurial import ui
check_style_hook(ui.ui())