summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-03-18 15:06:34 +1100
committerLuke Kanies <luke@madstop.com>2008-03-20 11:31:14 -0500
commit1dc6dc209afd8da9fdb84944c73c3e9f1c9b03f2 (patch)
treed193f67b5509e75e30586c21e53b3e54a6cf0055
parente7141568680b6bc5ba1fd87968e993039dff86f5 (diff)
downloadpuppet-1dc6dc209afd8da9fdb84944c73c3e9f1c9b03f2.tar.gz
puppet-1dc6dc209afd8da9fdb84944c73c3e9f1c9b03f2.tar.xz
puppet-1dc6dc209afd8da9fdb84944c73c3e9f1c9b03f2.zip
Final fix to #1136 - further changes to --test setting
-rwxr-xr-xbin/puppetd4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/puppetd b/bin/puppetd
index 769ced53f..063b93d44 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -289,6 +289,10 @@ if options[:test]
Puppet.settings.handlearg("--no-splay")
Puppet.settings.handlearg("--show_diff")
Puppet.settings.handlearg("--no-daemonize")
+ Puppet::Util::Log.newdestination(:console)
+ unless options[:debug] = true
+ Puppet::Util::Log.level = :info
+ end
options[:verbose] = true
options[:onetime] = true
options[:waitforcert] = 0