summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2013-12-20 15:22:16 +0100
committerAzul <azul@riseup.net>2013-12-20 15:22:16 +0100
commit1bf3ee50638ba1e06c7df297635f28b6c8715eb1 (patch)
tree8a64b1726dfaa3011fbd7e820aa5e9681a87a845
parentd8c28a0c3cba76fadd0495a79f67efd61458218c (diff)
proceed if design docs are already there
We'll add a flag to overwrite designs and / or security later. For now just make sure this does not crash tapicero.
-rw-r--r--lib/tapicero/user_database.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tapicero/user_database.rb b/lib/tapicero/user_database.rb
index dc28aa9..efd723a 100644
--- a/lib/tapicero/user_database.rb
+++ b/lib/tapicero/user_database.rb
@@ -33,8 +33,9 @@ module Tapicero
def upload_design_doc(file)
url = design_url(file.basename('.json'))
- Tapicero.logger.debug "uploading design doc #{file.basename} to #{url}"
CouchRest.put url, JSON.parse(file.read)
+ Tapicero.logger.debug "uploaded design doc #{file.basename} to #{url}"
+ rescue RestClient::Conflict
end