aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/base.rb
diff options
context:
space:
mode:
authorJeff Kreeftmeijer <jeff@kreeftmeijer.nl>2011-02-14 19:38:12 +0100
committerSantiago Pastorino <santiago@wyeworks.com>2011-02-27 18:53:18 -0200
commit86ad8a6c877636b4df7966233dff7fea377b0790 (patch)
treec70a55b53b27355a9729103222165989bc12fed8 /railties/lib/rails/generators/base.rb
parentf3e9cbc6955af8f430e75cf5d61e5940f7f46591 (diff)
downloadrails-86ad8a6c877636b4df7966233dff7fea377b0790.tar.gz
rails-86ad8a6c877636b4df7966233dff7fea377b0790.tar.bz2
rails-86ad8a6c877636b4df7966233dff7fea377b0790.zip
Make sure the Thor generator LoadError does not output --dev twice [#6431 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'railties/lib/rails/generators/base.rb')
-rw-r--r--railties/lib/rails/generators/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 131eb6ff6f..dfecd2a6e4 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -3,7 +3,7 @@ begin
rescue LoadError
puts "Thor is not available.\nIf you ran this command from a git checkout " \
"of Rails, please make sure thor is installed,\nand run this command " \
- "as `ruby #{$0} #{ARGV.join(" ")} --dev`"
+ "as `ruby #{$0} #{(ARGV | ['--dev']).join(" ")}`"
exit
end