aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-07-30 18:23:31 +0100
committerLouise Crow <louise.crow@gmail.com>2013-07-30 18:23:31 +0100
commit7caa577e504fb3212c833eb23dc0f1ed6dae464c (patch)
treeed5beb22d76e241d2de8515aef0c18b899ddaadf
parent8d49b6838f7dfc2e72808752735cc6ee224ffcb0 (diff)
Call it an error, not a warning.
-rw-r--r--lib/tasks/submodules.rake8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tasks/submodules.rake b/lib/tasks/submodules.rake
index 4d414ea84..1112e443e 100644
--- a/lib/tasks/submodules.rake
+++ b/lib/tasks/submodules.rake
@@ -7,17 +7,17 @@ namespace :submodules do
sha, repo, branch = commit_info.split(' ')
case sha[0,1]
when '+'
- $stderr.puts "Warning: Currently checked out submodule commit for #{repo}"
+ $stderr.puts "Error: Currently checked out submodule commit for #{repo}"
$stderr.puts "does not match the commit expected by this version of Alaveteli."
$stderr.puts "You can update it with 'git submodule update'."
exit(1)
when '-'
- $stderr.puts "Warning: Submodule #{repo} needs to be initialized."
+ $stderr.puts "Error: Submodule #{repo} needs to be initialized."
$stderr.puts "You can do this by running 'git submodule update --init'."
exit(1)
when 'U'
- $stderr.puts "Warning: Submodule #{repo} has merge conflicts."
- $stderr.puts "You'll probably need to resolve these to run Alaveteli."
+ $stderr.puts "Error: Submodule #{repo} has merge conflicts."
+ $stderr.puts "You'll need to resolve these to run Alaveteli."
exit(1)
else
exit(0)