summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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