diff options
| author | Tim Smith <tsmith@chef.io> | 2018-01-01 10:15:07 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-01-01 10:58:50 -0800 |
| commit | eb492c8c51ecb8f0c247d18f0eeb56269808b62d (patch) | |
| tree | 6cc8b56c2b57baad302d1e21a949536321e64ef5 | |
| parent | bfe8487a26f99d3cd3e08fffea8cf6457631cf69 (diff) | |
| download | chef-dash_r_solo.tar.gz | |
Remove deprecated -r option for Solo modedash_r_solo
We claimed we were going to remove this in Chef 13. Let's stop rewriting
ARGs now.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/application/solo.rb | 9 | ||||
| -rw-r--r-- | spec/unit/application/solo_spec.rb | 9 |
2 files changed, 2 insertions, 16 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}" diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb index 686ae745d8..5b9dbeaafd 100644 --- a/spec/unit/application/solo_spec.rb +++ b/spec/unit/application/solo_spec.rb @@ -1,6 +1,6 @@ # # Author:: AJ Christensen (<aj@junglist.gen.nz>) -# 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"); @@ -203,13 +203,6 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config app.reconfigure expect(ARGV.include?("--ez")).to be_falsey end - - it "replaces -r with --recipe-url" do - ARGV.push("-r", "http://junglist.gen.nz/recipes.tgz") - app.reconfigure - expect(ARGV.include?("-r")).to be_falsey - expect(ARGV.include?("--recipe-url")).to be_truthy - end end it "sets the repo path" do |