Merge pull request marklogic-community#350 from grtjn/323-clean-fores…

…t-breaks Fixed marklogic-community#323: clean of read-only forests breaks
joemfb · Jan 20, 2015 · f0e879b · f0e879b
2 parents 1993231 + 70ce563
commit f0e879b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
@@ -1378,11 +1378,13 @@ def deploy_content
 
   def clean_content
     logger.info "Cleaning #{@properties['ml.content-db']} on #{@hostname}"
-    execute_query %Q{
+    r = execute_query %Q{
       for $id in xdmp:database-forests(xdmp:database("#{@properties['ml.content-db']}"))
       return
-        xdmp:forest-clear($id)
+        try { xdmp:forest-clear($id) } catch ($ignore) { fn:concat("Skipped forest ", xdmp:forest-name($id), "..") }
     }
+    r.body = parse_json(r.body)
+    logger.info r.body
   end
 
   def deploy_cpf