diff options
| -rw-r--r-- | lib/chef/knife.rb | 5 | ||||
| -rw-r--r-- | lib/chef/knife/core/subcommand_loader.rb | 6 | ||||
| -rw-r--r-- | lib/chef/knife/rehash.rb | 5 |
3 files changed, 15 insertions, 1 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 657216bcf0..8f7232d927 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -145,6 +145,11 @@ class Chef end def self.subcommand_class_from(args) + if args.size == 1 and args[0].strip.downcase == "rehash" + # To prevent issues with the rehash file not pointing to the correct plugins, + # we always use the glob loader when regenerating the rehash file + @subcommand_loader = Chef::Knife::SubcommandLoader.gem_glob_loader(chef_config_dir) + end subcommand_loader.command_class_from(args) || subcommand_not_found!(args) end diff --git a/lib/chef/knife/core/subcommand_loader.rb b/lib/chef/knife/core/subcommand_loader.rb index 95ab219c80..dc0b0cc39c 100644 --- a/lib/chef/knife/core/subcommand_loader.rb +++ b/lib/chef/knife/core/subcommand_loader.rb @@ -58,6 +58,12 @@ class Chef end end + # There are certain situations where we want to shortcut the loader selection + # in self.for_config and force using the GemGlobLoader + def self.gem_glob_loader(chef_config_dir) + Knife::SubcommandLoader::GemGlobLoader.new(chef_config_dir) + end + def self.plugin_manifest? plugin_manifest_path && File.exist?(plugin_manifest_path) end diff --git a/lib/chef/knife/rehash.rb b/lib/chef/knife/rehash.rb index 3e7bab7e0f..8ede30643a 100644 --- a/lib/chef/knife/rehash.rb +++ b/lib/chef/knife/rehash.rb @@ -35,7 +35,10 @@ class Chef end def reload_plugins - Chef::Knife::SubcommandLoader::GemGlobLoader.new(@@chef_config_dir).load_commands + # The subcommand_loader for this knife command should _always_ be the GemGlobLoader. The GemGlobLoader loads + # plugins from disc and ensures the hash we write is always correct. By this point it should also already have + # loaded plugins and `load_commands` shouldn't have an effect. + Chef::Knife::subcommand_loader.load_commands end def generate_hash |