diff options
author | Thom May <thom@may.lt> | 2018-01-22 10:34:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 10:34:26 +0000 |
commit | 613d479bb4bb58e0e689b033a67a77d5effcb212 (patch) | |
tree | c4817d989aa0f8343378228e865b5061f312885e /lib | |
parent | eb8e9dfa53290acb6717d096e97e91c15db7e004 (diff) | |
parent | eb492c8c51ecb8f0c247d18f0eeb56269808b62d (diff) | |
download | chef-613d479bb4bb58e0e689b033a67a77d5effcb212.tar.gz |
Merge pull request #6719 from chef/dash_r_solo
Remove deprecated -r option for Solo mode
Diffstat (limited to 'lib')
-rw-r--r-- | lib/chef/application/solo.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index f246b1946a..6b4aef42b4 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -1,7 +1,7 @@ # # Author:: AJ Christensen (<aj@chef.io>) # Author:: Mark Mzyk (mmzyk@chef.io) -# Copyright:: Copyright 2008-2016, Chef Software, Inc. +# Copyright:: Copyright 2008-2018, Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -238,17 +238,10 @@ class Chef::Application::Solo < Chef::Application Chef::Config[:solo] = true - Chef::Log.deprecation("-r MUST be changed to --recipe-url, the -r option will be changed in Chef 13.0") if ARGV.include?("-r") - if !Chef::Config[:solo_legacy_mode] # Because we re-parse ARGV when we move to chef-client, we need to tidy up some options first. ARGV.delete("--ez") - # -r means something entirely different in chef-client land, so let's replace it with a "safe" value - if dash_r = ARGV.index("-r") - ARGV[dash_r] = "--recipe-url" - end - # For back compat reasons, we need to ensure that we try and use the cache_path as a repo first Chef::Log.debug "Current chef_repo_path is #{Chef::Config.chef_repo_path}" |