summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <mcquin@users.noreply.github.com>2014-06-09 15:35:27 -0700
committerClaire McQuin <mcquin@users.noreply.github.com>2014-06-09 15:35:27 -0700
commit473592842a44b43e76857d9f2add2b2d1d69d508 (patch)
tree2cc630a9be1797d53505ba8c8556c49da42aedea
parentfe38908f9a5e92730c8bf3898e6ab822afd787e9 (diff)
parent0e81eb05efb8de0e6cc51364f2f25e2a0f9cd784 (diff)
downloadchef-473592842a44b43e76857d9f2add2b2d1d69d508.tar.gz
Merge pull request #1404 from juliandunn/CHEF-4224
[CHEF-4224] tracing? throws an exception when chef-shell is first started
-rw-r--r--lib/chef/shell.rb1
-rw-r--r--spec/unit/shell_spec.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb
index 0788962e62..1519c47d88 100644
--- a/lib/chef/shell.rb
+++ b/lib/chef/shell.rb
@@ -111,6 +111,7 @@ module Shell
conf.prompt_i = "chef#{leader(m)} > "
conf.prompt_n = "chef#{leader(m)} ?> "
conf.prompt_s = "chef#{leader(m)}%l> "
+ conf.use_tracer = false
end
end
diff --git a/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index cce743873f..bf638e1c3a 100644
--- a/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
@@ -72,7 +72,7 @@ describe Shell do
conf.prompt_i.should == "chef > "
conf.prompt_n.should == "chef ?> "
conf.prompt_s.should == "chef%l> "
-
+ conf.use_tracer.should == false
end
it "has a prompt like ``chef:recipe > '' in recipe context" do