diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-01-25 18:40:24 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-01-25 18:40:24 -0800 |
| commit | a151dea58310b51fdcb7afa78171e7ab70044170 (patch) | |
| tree | de9df5a7a957119a7dae24e3335040108fa4cc12 /lib/chef/application/client.rb | |
| parent | 8a805c8a71a91cb17099acdc748f619eeba45efd (diff) | |
| download | chef-a151dea58310b51fdcb7afa78171e7ab70044170.tar.gz | |
fix master
broken by merging #2431. code was actually broken and the specs
were broken, not sure how it got into ready-to-merge in that state.
rolled back the FileUtils.rm_rf that was in the original patch since
it trashed my chef git repo and in light of:
https://github.com/ValveSoftware/steam-for-linux/issues/3671
i think the rm_rf is a bad idea.
Diffstat (limited to 'lib/chef/application/client.rb')
| -rw-r--r-- | lib/chef/application/client.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 024a160315..c0635e1cb5 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -207,7 +207,7 @@ class Chef::Application::Client < Chef::Application :boolean => true option :recipe_url, - :long => "--recipe-url", + :long => "--recipe-url=RECIPE_URL", :description => "Pull down a remote archive of recipes and unpack it to the cookbook cache. Only used in local mode." option :enable_reporting, @@ -276,8 +276,6 @@ class Chef::Application::Client < Chef::Application if !Chef::Config.local_mode && Chef::Config.has_key?(:recipe_url) Chef::Application.fatal!("chef-client recipe-url can be used only in local-mode", 1) elsif Chef::Config.local_mode && Chef::Config.has_key?(:recipe_url) - Chef::Log.debug "Cleanup path #{Chef::Config.chef_repo_path} before extract recipes into it" - FileUtils.rm_rf(Chef::Config.chef_repo_path, :secure => true) Chef::Log.debug "Creating path #{Chef::Config.chef_repo_path} to extract recipes into" FileUtils.mkdir_p(Chef::Config.chef_repo_path) tarball_path = File.join(Chef::Config.chef_repo_path, 'recipes.tgz') |