summaryrefslogtreecommitdiff
path: root/chef/lib/chef/couchdb.rb
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2009-08-17 15:56:14 -0700
committerAdam Jacob <adam@opscode.com>2009-08-20 13:31:59 -0700
commitdb58b8ab27b75a6de4539a4c5d47a491abf88ba3 (patch)
tree0916e50a489f4b39aa2c29e05542fa90d2c9c329 /chef/lib/chef/couchdb.rb
parent5def5cda4fed0a5e0078b4b7afd98767bfce0fb0 (diff)
downloadchef-db58b8ab27b75a6de4539a4c5d47a491abf88ba3.tar.gz
Catching a load error on Chef::CouchDB and Chef::Nanite (when used in the client) and updating the deps in the Rakefile
Diffstat (limited to 'chef/lib/chef/couchdb.rb')
-rw-r--r--chef/lib/chef/couchdb.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/chef/lib/chef/couchdb.rb b/chef/lib/chef/couchdb.rb
index d4f6aa5448..3030492e30 100644
--- a/chef/lib/chef/couchdb.rb
+++ b/chef/lib/chef/couchdb.rb
@@ -21,9 +21,14 @@ require 'chef/rest'
require 'chef/log'
require 'digest/sha2'
require 'json'
-require 'uuidtools'
require 'chef/nanite'
+# We want to fail on create if uuidtools isn't installed
+begin
+ require 'uuidtools'
+rescue LoadError
+end
+
class Chef
class CouchDB
include Chef::Mixin::ParamsValidate