summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Workman <workmad3@gmail.com>2014-09-04 21:05:20 +0100
committerDavid Workman <workmad3@gmail.com>2014-09-04 21:05:20 +0100
commitd3e373eb2412b9b0727f015c5f8ed0453fa891a8 (patch)
tree2510ead883dab49b2250c33d6cf2c84aef53c6da /lib
parent10621b23c26cd813cc8559d61105bf8be20e0c37 (diff)
downloadchef-d3e373eb2412b9b0727f015c5f8ed0453fa891a8.tar.gz
Fixing travis-ci failure.
Travis-CI runs failed due to Chef::Application::Apply picking up the explicit --format parameter and attempting to use it. Using ARGV.clear before a call to @app.reconfigure fixes this failure for now. Also a whitespace modification in apply.rb
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/application/apply.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 7e5d5406c0..a88f0c0c46 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -31,7 +31,6 @@ class Chef::Application::Apply < Chef::Application
banner "Usage: chef-apply [RECIPE_FILE] [-e RECIPE_TEXT] [-s]"
-
option :execute,
:short => "-e RECIPE_TEXT",
:long => "--execute RECIPE_TEXT",