diff options
author | Vasundhara Jagdale <vasundhara.jagdale@msystechnologies.com> | 2019-05-24 00:51:19 -0700 |
---|---|---|
committer | Bryan McLellan <btm@loftninjas.org> | 2019-05-24 00:51:19 -0700 |
commit | 82362cea3ecb50a808b5bff0300a17a946a89b22 (patch) | |
tree | 0a74f7b726d9a2d3804ca262c2e52fabeaf5e397 | |
parent | 6d6ef7d068b18f4eb47a79790f5cdf1ff40d669c (diff) | |
download | chef-82362cea3ecb50a808b5bff0300a17a946a89b22.tar.gz |
Fix for knife bootstrap inheritance issue with knife plugins (#8585)
* Fix for knife bootstrap inheritance issue with knife plugins
Signed-off-by: Vasu1105 <vasundhara.jagdale@msystechnologies.com>
-rw-r--r-- | lib/chef/chef_fs/knife.rb | 2 | ||||
-rw-r--r-- | lib/chef/knife.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_download.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_install.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_list.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_search.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_share.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_show.rb | 1 | ||||
-rw-r--r-- | lib/chef/knife/cookbook_site_unshare.rb | 1 |
9 files changed, 1 insertions, 9 deletions
diff --git a/lib/chef/chef_fs/knife.rb b/lib/chef/chef_fs/knife.rb index 18a2958cb5..bfb354bade 100644 --- a/lib/chef/chef_fs/knife.rb +++ b/lib/chef/chef_fs/knife.rb @@ -40,8 +40,6 @@ class Chef # Ensure we always get to do our includes, whether subclass calls deps or not c.deps do end - - c.options.merge!(options) end option :repo_mode, diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 5057fd5880..2460dbaed8 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -88,6 +88,7 @@ class Chef end def self.inherited(subclass) + super unless subclass.unnamed? subcommands[subclass.snake_case_name] = subclass subcommand_files[subclass.snake_case_name] += diff --git a/lib/chef/knife/cookbook_site_download.rb b/lib/chef/knife/cookbook_site_download.rb index 655bf602a5..4fc435f957 100644 --- a/lib/chef/knife/cookbook_site_download.rb +++ b/lib/chef/knife/cookbook_site_download.rb @@ -25,7 +25,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site download COOKBOOK [VERSION] (options)" category "deprecated" diff --git a/lib/chef/knife/cookbook_site_install.rb b/lib/chef/knife/cookbook_site_install.rb index badbcc9b98..a9c15661ff 100644 --- a/lib/chef/knife/cookbook_site_install.rb +++ b/lib/chef/knife/cookbook_site_install.rb @@ -25,7 +25,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site install COOKBOOK [VERSION] (options)" category "deprecated" diff --git a/lib/chef/knife/cookbook_site_list.rb b/lib/chef/knife/cookbook_site_list.rb index 81e1ffc278..27c836c247 100644 --- a/lib/chef/knife/cookbook_site_list.rb +++ b/lib/chef/knife/cookbook_site_list.rb @@ -25,7 +25,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site list (options)" category "deprecated" diff --git a/lib/chef/knife/cookbook_site_search.rb b/lib/chef/knife/cookbook_site_search.rb index 8aa195fe22..9e36afc5ff 100644 --- a/lib/chef/knife/cookbook_site_search.rb +++ b/lib/chef/knife/cookbook_site_search.rb @@ -25,7 +25,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site search QUERY (options)" category "deprecated" diff --git a/lib/chef/knife/cookbook_site_share.rb b/lib/chef/knife/cookbook_site_share.rb index 99d9d612df..d959784bb9 100644 --- a/lib/chef/knife/cookbook_site_share.rb +++ b/lib/chef/knife/cookbook_site_share.rb @@ -26,7 +26,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site share COOKBOOK [CATEGORY] (options)" category "deprecated" diff --git a/lib/chef/knife/cookbook_site_show.rb b/lib/chef/knife/cookbook_site_show.rb index ef1f61a6ca..84a7c249e5 100644 --- a/lib/chef/knife/cookbook_site_show.rb +++ b/lib/chef/knife/cookbook_site_show.rb @@ -25,7 +25,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site show COOKBOOK [VERSION] (options)" category "deprecated" diff --git a/lib/chef/knife/cookbook_site_unshare.rb b/lib/chef/knife/cookbook_site_unshare.rb index 13f02dd4d7..f712ad97e4 100644 --- a/lib/chef/knife/cookbook_site_unshare.rb +++ b/lib/chef/knife/cookbook_site_unshare.rb @@ -26,7 +26,6 @@ class Chef # Handle the subclassing (knife doesn't do this :() dependency_loaders.concat(superclass.dependency_loaders) - options.merge!(superclass.options) banner "knife cookbook site unshare COOKBOOK (options)" category "deprecated" |