summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-05-27 10:09:38 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-05-27 10:09:38 -0700
commitdf2f3b5bb176df112b7ece091be27736263fed61 (patch)
tree1075040d635229ce3b734a275c0989306fb1d1bc /lib
parent51a1893b47ddacb086e838e965b26d0eefdf39a1 (diff)
downloadchef-zero-df2f3b5bb176df112b7ece091be27736263fed61.tar.gz
Make clear restore org defaults
Diffstat (limited to 'lib')
-rw-r--r--lib/chef_zero/data_store/v1_to_v2_adapter.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/chef_zero/data_store/v1_to_v2_adapter.rb b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
index 29dbd19..3b2fc8d 100644
--- a/lib/chef_zero/data_store/v1_to_v2_adapter.rb
+++ b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
@@ -6,8 +6,8 @@ module ChefZero
def initialize(real_store, single_org, options = {})
@real_store = real_store
@single_org = single_org
- org_defaults = options[:org_defaults] || {}
- @defaults = { 'organizations' => { single_org => org_defaults }}
+ @options = options
+ clear
end
ORG_DEFAULTS = {
@@ -27,7 +27,12 @@ module ChefZero
attr_reader :single_org
def clear
- real_store.clear
+ if @options[:org_defaults]
+ @defaults = { 'organizations' => { @single_org => @options[:org_defaults] }}
+ else
+ @defaults = {}
+ end
+ real_store.clear if real_store.respond_to?(:clear)
end
def create_dir(path, name, *options)