From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Apr 2012 10:25:03 +0000 (+0000)
Subject: Merged r9339 from trunk.
X-Git-Tag: 1.4.0~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a7250c41e25e40c25faefc637e0680d12fda38a0;p=redmine.git

Merged r9339 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9340 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 06d03ae73..05d369788 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -48,8 +48,8 @@ namespace :ci do
         test_conf = { 'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), 'database' => test_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins', 'encoding' => 'utf8' }
       when 'postgresql'
         raise "Error creating databases" unless
-          system(%|psql -U jenkins -d postgres -c "create database #{dev_db_name} owner jenkins encoding 'UTF8';|) &&
-          system(%|psql -U jenkins -d postgres -c "create database #{test_db_name} owner jenkins encoding 'UTF8';|)
+          system(%|psql -U jenkins -d postgres -c "create database #{dev_db_name} owner jenkins encoding 'UTF8';"|) &&
+          system(%|psql -U jenkins -d postgres -c "create database #{test_db_name} owner jenkins encoding 'UTF8';"|)
         dev_conf =  { 'adapter' => 'postgresql', 'database' => dev_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins' }
         test_conf = { 'adapter' => 'postgresql', 'database' => test_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins' }
       when 'sqlite3'