Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5

Conflicts:
	vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb

3 files changed, 10 insertions, 6 deletions

diff --git a/config/crontab.ugly b/config/crontab.ugly
index fdfd9f171..43b191fd4 100644
--- a/config/crontab.ugly
+++ b/config/crontab.ugly
@@ -10,7 +10,7 @@ PATH=/usr/local/bin:/usr/bin:/bin
 MAILTO=cron-!!(*= $site *)!!@mysociety.org
 
 # Every 5 minutes
-*/5 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/update-xapian-index.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/update-xapian-index verbose=true >> /data/vhost/!!(*= $vhost *)!!/logs/update-xapian-index.log || echo "stalled?"
+*/5 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/update-xapian-index.lock "/data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/update-xapian-index verbose=true" >> /data/vhost/!!(*= $vhost *)!!/logs/update-xapian-index.log || echo "stalled?"
 # Every 10 minutes
 5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-alert-tracks check
 
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 963d0b6f0..b95534e4f 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -83,8 +83,8 @@ constraints whilst running the tests they also need to be a superuser.
 
 The following command will set up a user 'foi' with password 'foi':
 
-    echo "CREATE DATABASE foi_development encoding = 'SQL_ASCII';
-    CREATE DATABASE foi_test encoding = 'SQL_ASCII';
+    echo "CREATE DATABASE foi_development encoding 'SQL_ASCII' template template0;
+    CREATE DATABASE foi_test encoding 'SQL_ASCII' template template0;
     CREATE USER foi WITH CREATEUSER;
     ALTER USER foi WITH PASSWORD 'foi';
     ALTER USER foi WITH CREATEDB;
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
index e2eb0bec4..59b3777da 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -583,6 +583,10 @@ module ActsAsXapian
         ActsAsXapian.writable_db.close
     end
     
+    def ActsAsXapian._is_xapian_db(path)
+        return File.exist?(File.join(temp_path, "iamflint")) or File.exist?(File.join(temp_path, "iamchert"))
+    end
+    
     # You must specify *all* the models here, this totally rebuilds the Xapian
     # database.  You'll want any readers to reopen the database after this.
     #
@@ -599,7 +603,7 @@ module ActsAsXapian
         new_path = ActsAsXapian.db_path + ".new"
         old_path = ActsAsXapian.db_path
         if File.exist?(new_path)
-            raise "found existing " + new_path + " which is not Xapian flint database, please delete for me" if not File.exist?(File.join(new_path, "iamflint"))
+            raise "found existing " + new_path + " which is not Xapian flint database, please delete for me" if not ActsAsXapian._is_xapian_db(new_path)
             FileUtils.rm_r(new_path)
         end
         if update_existing
@@ -628,7 +632,7 @@ module ActsAsXapian
         # Rename into place
         temp_path = old_path + ".tmp"
         if File.exist?(temp_path)
-            raise "temporary database found " + temp_path + " which is not Xapian flint database, please delete for me" if not File.exist?(File.join(temp_path, "iamflint"))
+            raise "temporary database found " + temp_path + " which is not Xapian flint database, please delete for me" if not ActsAsXapian._is_xapian_db(temp_path)
             FileUtils.rm_r(temp_path)
         end
         if File.exist?(old_path)
@@ -638,7 +642,7 @@ module ActsAsXapian
 
         # Delete old database
         if File.exist?(temp_path)
-            raise "old database now at " + temp_path + " is not Xapian flint database, please delete for me" if not File.exist?(File.join(temp_path, "iamflint"))
+            raise "old database now at " + temp_path + " is not Xapian flint database, please delete for me" if not ActsAsXapian._is_xapian_db(temp_path)
             FileUtils.rm_r(temp_path)
         end