summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2009-03-05 17:05:06 -0500
committerAli Saidi <saidi@eecs.umich.edu>2009-03-05 17:05:06 -0500
commitb8548c011d03025dd31eae6bb8cb08033fb52c96 (patch)
tree255f8c83299579ce3dfae4ed73bda193a2fee4db
parent9e1dc7f20549e9590c5b1450be17ff03057e346f (diff)
downloadgem5-b8548c011d03025dd31eae6bb8cb08033fb52c96.tar.xz
SCons: Fix bug with .hg dir not existing.
-rw-r--r--SConstruct5
1 files changed, 2 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index a3cae0fc9..a0f273aad 100644
--- a/SConstruct
+++ b/SConstruct
@@ -211,17 +211,15 @@ If you are actually a M5 developer, please fix this and
run the style hook. It is important.
"""
+hg_info = "Unknown"
if hgdir.exists():
# 1) Grab repository revision if we know it.
cmd = "hg id -n -i -t -b"
try:
hg_info = read_command(cmd, cwd=env.root.abspath).strip()
except OSError:
- hg_info = "Unknown"
print mercurial_bin_not_found
- env['HG_INFO'] = hg_info
-
# 2) Ensure that the style hook is in place.
try:
ui = None
@@ -240,6 +238,7 @@ if hgdir.exists():
sys.exit(1)
else:
print ".hg directory not found"
+env['HG_INFO'] = hg_info
###################################################
#