summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2016-04-28 15:20:03 +0100
committerCurtis Dunham <Curtis.Dunham@arm.com>2016-04-28 15:20:03 +0100
commitfa5fda90c0a5860b31901fb783c1dcffbc9029b2 (patch)
treea23b842c89e039296422c462cffa13879a4eecbd
parent3f24000d468c06116e818b9150cc9f71d325176f (diff)
downloadgem5-fa5fda90c0a5860b31901fb783c1dcffbc9029b2.tar.xz
scons: emit correct message before installing git hook
Change-Id: Ied2e018a9a1b6db446edbaac871ac4efd795ec36 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
-rwxr-xr-xSConstruct10
1 files changed, 6 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 9f277d2a9..5e4eca940 100755
--- a/SConstruct
+++ b/SConstruct
@@ -265,12 +265,14 @@ gitdir = main.root.Dir(".git")
style_message = """
You're missing the gem5 style hook, which automatically checks your code
-against the gem5 style rules on hg commit and qrefresh commands. This
-script will now install the hook in your %s.
+against the gem5 style rules on %s.
+This script will now install the hook in your %s.
Press enter to continue, or ctrl-c to abort: """
-mercurial_style_message = style_message % ".hg/hgrc file"
-git_style_message = style_message % ".git/hooks/ directory"
+mercurial_style_message = style_message % ("hg commit and qrefresh commands",
+ ".hg/hgrc file")
+git_style_message = style_message % ("'git commit'",
+ ".git/hooks/ directory")
mercurial_style_upgrade_message = """
Your Mercurial style hooks are not up-to-date. This script will now