diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-26 20:32:51 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-26 20:32:51 -0800 |
| commit | 7a09548c07dc473c220cd9b4def190d53b7e8c0f (patch) | |
| tree | b17eb4615f2c23a7b1f58a4947bf3161952e0fa2 /lib/chef/knife.rb | |
| parent | bd43de8cb5b58dc7731d2945434aa2edf3d585e4 (diff) | |
| download | chef-7a09548c07dc473c220cd9b4def190d53b7e8c0f.tar.gz | |
Stop mixlib-cli default clobbering mixlib-config settingslcg/fix-default-precedence
The pre-14 precedence level is:
1. mixlib-cli setting
2. mixlib-cli default
3. mixlib-config setting
4. mixlib-config default
This means that if an option has a mixlib-cli default that it cannot
ever be set in the config file.
This PR swaps 2+3 around:
1. mixlib-cli setting
2. mixlib-config setting
3. mixlib-cli default
4. mixlib-config default
Now the mixlib-cli defaults still take precedence over mixlib-config
defaults, but it is possible to set a value in config.rb if there's
a mixlib-cli default setting (which creeps into the settings in hidden
ways if you just use `boolean: true` in mixlib-cli).
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/knife.rb')
| -rw-r--r-- | lib/chef/knife.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 2853bf65dd..4e975c2b27 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -1,7 +1,7 @@ # # Author:: Adam Jacob (<adam@chef.io>) # Author:: Christopher Brown (<cb@chef.io>) -# Copyright:: Copyright 2009-2017, Chef Software Inc. +# Copyright:: Copyright 2009-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); |